From 0a7a41b9961c2cf6bdde1e02a3e1161dcfaa7f66 Mon Sep 17 00:00:00 2001 From: alvatip Date: Wed, 16 Jun 2021 18:41:27 +0200 Subject: [PATCH] FIX: #30 Non-apple alternative This commit aims to resolve issue #30 It add 2 "alternative" icons, for softwarecenter and file-manager. To use them, I added a parameter (-a or --alternative) in the install.sh. When specified, it will call a function to change the name of the icons and use the "alternative" one instead of the "apple" icons during installation. At the end of the installation, it reset the icons to their default value. --- README.md | 1 + install.sh | 34 +++++++++++- .../scalable/file-manager-alternative.svg | 53 +++++++++++++++++++ .../scalable/softwarecenter-alternative.svg | 40 ++++++++++++++ 4 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 src/apps/scalable/file-manager-alternative.svg create mode 100644 src/apps/scalable/softwarecenter-alternative.svg diff --git a/README.md b/README.md index 564754d6..d0994e93 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ Usage: `./install.sh` **[OPTIONS...]** |:--------------------|:-------------| |-d, --dest | Specify theme destination directory (Default: $HOME/.themes)| |-n, --name | Specify theme name (Default: WhiteSur)| +|-a, --alternative | Install alternative icons for software center and file-manager| |-h, --help | Show this help| > **Note for snaps:** To use these icons with snaps, the best way is to make a copy of the application's .desktop located in `/var/lib/snapd/desktop/applications/name-of-the-snap-application.desktop` into `$HOME/.local/share/applications/`. Then use any text editor and change the "Icon=" to "Icon=name-of-the-icon.svg" diff --git a/install.sh b/install.sh index e27b46b0..aa228da0 100755 --- a/install.sh +++ b/install.sh @@ -22,9 +22,31 @@ usage() { printf " %-25s%s\n" "-d, --dest DIR" "Specify theme destination directory (Default: ${DEST_DIR})" printf " %-25s%s\n" "-n, --name NAME" "Specify theme name (Default: ${THEME_NAME})" printf " %-25s%s\n" "-t, --theme VARIANTS" "Specify folder color [default|purple|pink|red|orange|yellow|green|grey|all] (Default: MacOS blue)" + printf " %-25s%s\n" "-a, --alternative" "Install alternative icons for software center and file-manager" printf " %-25s%s\n" "-h, --help" "Show this help" } +# change the name of software and file-manager to use the alternative +alternative() { + local dir="${SRC_DIR}/src/apps/scalable" + if [[ ${1} == 'unset' ]]; then + # Software + mv ${dir}/softwarecenter.svg ${dir}/softwarecenter-alternative.svg + mv ${dir}/softwarecenter-old.svg ${dir}/softwarecenter.svg + # File-manager + mv ${dir}/file-manager.svg ${dir}/file-manager-alternative.svg + mv ${dir}/file-manager-old.svg ${dir}/file-manager.svg + else + # Software + mv ${dir}/softwarecenter.svg ${dir}/softwarecenter-old.svg + mv ${dir}/softwarecenter-alternative.svg ${dir}/softwarecenter.svg + # File-manager + mv ${dir}/file-manager.svg ${dir}/file-manager-old.svg + mv ${dir}/file-manager-alternative.svg ${dir}/file-manager.svg + fi +} + + install() { local dest=${1} local name=${2} @@ -183,6 +205,10 @@ while [[ $# -gt 0 ]]; do esac done ;; + -a|--alternative) + alternative + alternative=true + ;; -h|--help) usage exit 0 @@ -197,11 +223,17 @@ while [[ $# -gt 0 ]]; do done install_theme() { + for theme in "${themes[@]-${THEME_VARIANTS[0]}}"; do for color in "${colors[@]-${COLOR_VARIANTS[@]}}"; do install "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${theme}" "${color}" done done + + # restore the names in the source file + if [[ $alternative == true ]]; then + alternative 'unset' + fi } -install_theme +install_theme \ No newline at end of file diff --git a/src/apps/scalable/file-manager-alternative.svg b/src/apps/scalable/file-manager-alternative.svg new file mode 100644 index 00000000..2bb17b1d --- /dev/null +++ b/src/apps/scalable/file-manager-alternative.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/apps/scalable/softwarecenter-alternative.svg b/src/apps/scalable/softwarecenter-alternative.svg new file mode 100644 index 00000000..c2a970db --- /dev/null +++ b/src/apps/scalable/softwarecenter-alternative.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +