From ab9467b1e614e35757ffd37b47a177381c059fb1 Mon Sep 17 00:00:00 2001 From: dominichayesferen Date: Fri, 10 Feb 2023 10:33:00 +0000 Subject: [PATCH] Fixes/improvements for installer --- install.sh | 14 +++++++++++--- mod-files/chrome/userChrome.css | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 796641e..0425602 100755 --- a/install.sh +++ b/install.sh @@ -52,11 +52,19 @@ for directory in ~/.mozilla/firefox ~/.var/app/org.mozilla.firefox/.mozilla/fire done mv -f "$profile/chrome" "$profile/chrome.bak""$bkupcounts" echo "Backed up your old userChrome folder to chrome.bak""$bkupcounts." - else #Delete old userChrome if it's just an installation of GTKless - rm -rf "$profile/chrome" + else #Delete old ferenChrome, but leave userChrome.css intact, if it's just an installation of GTKless + rm -f "$profile/chrome/ferenChrome.css" fi fi - cp -Rf "$DIR/mod-files/chrome" "$profile/chrome" + if [ ! -d "$profile/chrome" ]; then #On new installs, remake the chrome folder... + mkdir "$profile/chrome" + fi + if [ ! -f "$profile/chrome/userChrome.css" ]; then #...and copy everything over. + cp -Rf "$DIR/mod-files/chrome/"* "$profile/chrome/" + else #If GTKless is already installed, only replace GTKless's CSS + cp -f "$DIR/mod-files/chrome/ferenChrome.css" "$profile/chrome/" + fi + #Now it's user.js's turn if [ -f "$profile/user.js" ]; then if ! grep -q '// Mozilla User Preferences for GTKless' "$profile/user.js"; then bkupcounts=0 diff --git a/mod-files/chrome/userChrome.css b/mod-files/chrome/userChrome.css index 81154b6..a0b2a4f 100755 --- a/mod-files/chrome/userChrome.css +++ b/mod-files/chrome/userChrome.css @@ -1,2 +1,2 @@ -@import url("css/leptonChrome.css"); +/* insert other mods, above ferenChrome.css, here */ @import url("ferenChrome.css");