From e0085aa48731a19a9f945099de878c8c04ca1bdf Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Tue, 7 Nov 2023 06:53:36 +0000 Subject: [PATCH] Fixed rclone and added logs to browser plugins --- .../run_onchange_after_40-chrome.sh.tmpl | 2 ++ .../run_onchange_after_40-firefox.sh.tmpl | 21 ++++++++++++++----- .../run_onchange_after_50-rclone.sh.tmpl | 8 +++---- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/home/.chezmoiscripts/universal/run_onchange_after_40-chrome.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_40-chrome.sh.tmpl index 4e213ae9..9b0eba22 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_40-chrome.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_40-chrome.sh.tmpl @@ -30,6 +30,7 @@ function chromeSetUp() { ### Ensure Chrome policies directory is present + logg info 'Processing policy directories for Chromium based browsers' for POLICY_DIR in "/opt/google/chrome/policies" "/etc/chromium/policies" "/etc/brave/policies"; do if [ -d "$(dirname "$POLICY_DIR")" ]; then ### Managed policies @@ -53,6 +54,7 @@ function chromeSetUp() { done ### Add Chrome extension JSON + logg info 'Populating Chrome extension JSON' for EXTENSION_DIR in "/opt/google/chrome/extensions" "/etc/chromium/extensions" "/etc/brave/extensions" "$HOME/Library/Application Support/Google/Chrome/External Extensions" "$HOME/Library/Application Support/Microsoft/Edge/External Extensions" "$HOME/Library/Application Support/BraveSoftware/Brave-Browser/External Extensions"; do ### Ensure program-type is installed if [ -d "$(dirname "$EXTENSION_DIR")" ]; then diff --git a/home/.chezmoiscripts/universal/run_onchange_after_40-firefox.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_40-firefox.sh.tmpl index 5ab3b192..f3e78660 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_40-firefox.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_40-firefox.sh.tmpl @@ -49,6 +49,7 @@ # Firefox plugins: {{ list (.firefoxAddOns | toString | replace "[" "" | replace "]" "") | uniq | join " " }} +logg info 'Processing post-logic for Firefox-based browsers' function firefoxSetup() { ### Installs the Firefox Profile Connector on Linux systems (Snap / Flatpak installs are not included in this function, but instead inline below) function installFirefoxProfileConnector() { @@ -69,7 +70,8 @@ function firefoxSetup() { # TODO - figure out how to do this for other installations like Flatpak and macOS and Librewolf for FIREFOX_DIR in '/usr/lib/firefox' '/usr/lib/firefox-esr' '/etc/firefox' '/etc/firefox-esr' '/Applications/Firefox.app/Contents/Resources' '/Applications/LibreWolf.app/Contents/Resources/'; do if [ -d "$FIREFOX_DIR" ] && [ -d "${XDG_DATA_HOME:-$HOME/.local/share}/firefox" ] && command -v rsync > /dev/null; then - sudo rsync -artvu "${XDG_DATA_HOME:-$HOME/.local/share}/firefox/" "$FIREFOX_DIR" + logg info "Syncing enterprise profiles from ${XDG_DATA_HOME:-$HOME/.local/share}/firefox to $FIREFOX_DIR" + sudo rsync -artvu "${XDG_DATA_HOME:-$HOME/.local/share}/firefox/" "$FIREFOX_DIR" > /dev/null fi done @@ -133,6 +135,7 @@ function firefoxSetup() { elif [ "$SETTINGS_DIR" == "$HOME/Library/Application Support/LibreWolf/Profiles" ]; then FIREFOX_EXE="/Applications/LibreWolf.app/Contents/MacOS/librewolf" if [ ! -f "$FIREFOX_EXE" ] || [ ! -d /Applications ]; then + logg info "$FIREFOX_EXE is not a file" continue fi elif [ "$SETTINGS_DIR" == "$HOME/snap/firefox/common/.mozilla/firefox" ]; then @@ -182,21 +185,29 @@ function firefoxSetup() { fi fi ### Initiatize Firefox default profiles + logg info "Processing executable located at $FIREFOX_EXE" if command -v "$FIREFOX_EXE" > /dev/null; then ### Create default profile by launching Firefox headlessly logg info "Firefox executable set to $FIREFOX_EXE" if [ ! -d "$SETTINGS_DIR" ]; then - logg info 'Running Firefox headlessly to generate default profiles' - timeout 8 "$FIREFOX_EXE" --headless + logg info 'Running Firefox (or its derivative) headlessly to generate default profiles' + timeout 14 "$FIREFOX_EXE" --headless logg info 'Finished running Firefox headlessly' elif [ -d /Applications ] && [ -d /System ] && [ ! -f "$SETTINGS_DIR/../installs.ini" ]; then - logg info 'Running Firefox headlessly to generate default profiles because install.ini is not at the macOS default location.' - timeout 8 "$FIREFOX_EXE" --headless + logg info 'Running Firefox (or its derivative) headlessly to generate default profiles because install.ini is not at the macOS default location.' + timeout 14 "$FIREFOX_EXE" --headless logg info 'Finished running Firefox headlessly (while fixing the missing macOS installs.ini issue)' fi + ### Ensure settings directory exists (since the application was brought up temporarily headlessly) + if [ ! -d "$SETTINGS_DIR" ]; then + logg warn "The settings directory located at $SETTINGS_DIR failed to be populated by running the browser headlessly" + continue + fi + ### Add the populated profiles.ini logg info "Copying "${XDG_DATA_HOME:-$HOME/.local/share}/firefox/profiles.ini" to profile directory" + logg info "The settings directory is $SETTINGS_DIR" if [ -d /Applications ] && [ -d /System ]; then # macOS logg info "Copying ~/.local/share/firefox/profiles.ini to $SETTINGS_DIR/../profiles.ini" diff --git a/home/.chezmoiscripts/universal/run_onchange_after_50-rclone.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_50-rclone.sh.tmpl index ae1fbb9f..6d9ce2f9 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_50-rclone.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_50-rclone.sh.tmpl @@ -51,16 +51,16 @@ if command -v rclone > /dev/null; then {{- if and (or (and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_ID"))) (env "CLOUDFLARE_R2_ID")) (or (and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_SECRET"))) (env "CLOUDFLARE_R2_SECRET")) (ne .user.cloudflare.r2 "") }} - logg info 'Removing ~/.config/rclone/rclone.conf INSTALL DOCTOR managed block' + logg info 'Removing ~/.config/rclone/rclone.conf Install Doctor managed block' CONFIG_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/rclone/rclone.conf" - if cat "$CONFIG_FILE" | grep '# INSTALL DOCTOR MANAGED S3 START'; then + if cat "$CONFIG_FILE" | grep '# INSTALL DOCTOR MANAGED S3 START' > /dev/null; then # TODO: Remove old block START_LINE="$(echo `grep -n -m 1 "# INSTALL DOCTOR MANAGED S3 START" "$CONFIG_FILE" | cut -f1 -d ":"`)" END_LINE="$(echo `grep -n -m 1 "# INSTALL DOCTOR MANAGED S3 END" "$CONFIG_FILE" | cut -f1 -d ":"`)" if command -v gsed > /dev/null; then - gsed -i "$START_LINE,$END_LINEd" "$CONFIG_FILE" + gsed -i "$START_LINE,${END_LINE}d" "$CONFIG_FILE" else - sed -i "$START_LINE,$END_LINEd" "$CONFIG_FILE" + sed -i "$START_LINE,${END_LINE}d" "$CONFIG_FILE" fi fi logg info 'Adding ~/.config/rclone/rclone.conf INSTALL DOCTOR managed block'