From b992cf36331f37e8d44c3794b090b967604e55c3 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Fri, 1 Mar 2024 01:24:08 +0800 Subject: [PATCH] Fixed #211 --- install.sh | 88 +++++----- src/places/scalable/user-trash-dark.svg | 31 ++++ src/places/scalable/user-trash-full-dark.svg | 161 +++++++++++++++++++ 3 files changed, 238 insertions(+), 42 deletions(-) create mode 100644 src/places/scalable/user-trash-dark.svg create mode 100644 src/places/scalable/user-trash-full-dark.svg diff --git a/install.sh b/install.sh index b92fb0f7..a473920c 100755 --- a/install.sh +++ b/install.sh @@ -47,57 +47,59 @@ install() { local THEME_DIR=${dest}/${name}${theme}${color} - [[ -d ${THEME_DIR} ]] && rm -rf ${THEME_DIR} + [[ -d "${THEME_DIR}" ]] && rm -rf "${THEME_DIR}" echo "Installing '${THEME_DIR}'..." - mkdir -p ${THEME_DIR} - cp -r "${SRC_DIR}"/{COPYING,AUTHORS} ${THEME_DIR} - cp -r "${SRC_DIR}"/src/index.theme ${THEME_DIR} + mkdir -p "${THEME_DIR}" + cp -r "${SRC_DIR}"/{COPYING,AUTHORS} "${THEME_DIR}" + cp -r "${SRC_DIR}"/src/index.theme "${THEME_DIR}" - #cd ${THEME_DIR} - sed -i "s/${name}/${name}${theme}${color}/g" ${THEME_DIR}/index.theme + #cd "${THEME_DIR}" + sed -i "s/${name}/${name}${theme}${color}/g" "${THEME_DIR}"/index.theme if [[ ${color} == '' ]]; then - mkdir -p ${THEME_DIR}/status - cp -r "${SRC_DIR}"/src/{actions,animations,apps,categories,devices,emblems,mimes,places,preferences} ${THEME_DIR} - cp -r "${SRC_DIR}"/src/status/{16,22,24,32,symbolic} ${THEME_DIR}/status + mkdir -p "${THEME_DIR}"/status + cp -r "${SRC_DIR}"/src/{actions,animations,apps,categories,devices,emblems,mimes,places,preferences} "${THEME_DIR}" + cp -r "${SRC_DIR}"/src/status/{16,22,24,32,symbolic} "${THEME_DIR}"/status + + rm -rf "${THEME_DIR}"/places/scalable/user-trash{'','-full'}-dark.svg if [[ ${black:-} == 'true' ]]; then sed -i "s/#ffffff/#363636/g" "${THEME_DIR}"/status/{16,22,24}/* fi if [[ ${bold:-} == 'true' ]]; then - cp -r "${SRC_DIR}"/bold/* ${THEME_DIR} + cp -r "${SRC_DIR}"/bold/* "${THEME_DIR}" fi if [[ $DESKTOP_SESSION == '/usr/share/xsessions/budgie-desktop' ]]; then - cp -r "${SRC_DIR}"/src/status/symbolic-budgie/*.svg ${THEME_DIR}/status/symbolic + cp -r "${SRC_DIR}"/src/status/symbolic-budgie/*.svg "${THEME_DIR}"/status/symbolic fi if [[ ${alternative:-} == 'true' ]]; then - cp -r "${SRC_DIR}"/alternative/* ${THEME_DIR} + cp -r "${SRC_DIR}"/alternative/* "${THEME_DIR}" fi if [[ ${theme} != '' ]]; then - cp -r "${SRC_DIR}"/colors/color${theme}/*.svg ${THEME_DIR}/places/scalable + cp -r "${SRC_DIR}"/colors/color${theme}/*.svg "${THEME_DIR}"/places/scalable fi - cp -r "${SRC_DIR}"/links/{actions,apps,categories,devices,emblems,mimes,places,status,preferences} ${THEME_DIR} + cp -r "${SRC_DIR}"/links/{actions,apps,categories,devices,emblems,mimes,places,status,preferences} "${THEME_DIR}" fi if [[ ${color} == '-light' ]]; then - mkdir -p ${THEME_DIR}/status - cp -r "${SRC_DIR}"/src/status/{16,22,24} ${THEME_DIR}/status + mkdir -p "${THEME_DIR}"/status + cp -r "${SRC_DIR}"/src/status/{16,22,24} "${THEME_DIR}"/status if [[ ${bold:-} == 'true' ]]; then - cp -r "${SRC_DIR}"/bold/status/{16,22,24} ${THEME_DIR}/status + cp -r "${SRC_DIR}"/bold/status/{16,22,24} "${THEME_DIR}"/status fi # Change icon color for light theme sed -i "s/#ffffff/#363636/g" "${THEME_DIR}"/status/{16,22,24}/* - cp -r "${SRC_DIR}"/links/status/{16,22,24} ${THEME_DIR}/status + cp -r "${SRC_DIR}"/links/status/{16,22,24} "${THEME_DIR}"/status cd ${dest} ln -s ../${name}${theme}/actions ${name}${theme}-light/actions @@ -114,27 +116,30 @@ install() { fi if [[ ${color} == '-dark' ]]; then - mkdir -p ${THEME_DIR}/{apps,categories,emblems,devices,mimes,places,status} + mkdir -p "${THEME_DIR}"/{apps,categories,emblems,devices,mimes,places,status} - cp -r "${SRC_DIR}"/src/actions ${THEME_DIR} - cp -r "${SRC_DIR}"/src/apps/symbolic ${THEME_DIR}/apps - cp -r "${SRC_DIR}"/src/categories/symbolic ${THEME_DIR}/categories - cp -r "${SRC_DIR}"/src/emblems/symbolic ${THEME_DIR}/emblems - cp -r "${SRC_DIR}"/src/mimes/symbolic ${THEME_DIR}/mimes - cp -r "${SRC_DIR}"/src/devices/{16,22,24,symbolic} ${THEME_DIR}/devices - cp -r "${SRC_DIR}"/src/places/{16,22,24,symbolic} ${THEME_DIR}/places - cp -r "${SRC_DIR}"/src/status/symbolic ${THEME_DIR}/status + cp -r "${SRC_DIR}"/src/actions "${THEME_DIR}" + cp -r "${SRC_DIR}"/src/apps/symbolic "${THEME_DIR}"/apps + cp -r "${SRC_DIR}"/src/categories/symbolic "${THEME_DIR}"/categories + cp -r "${SRC_DIR}"/src/emblems/symbolic "${THEME_DIR}"/emblems + cp -r "${SRC_DIR}"/src/mimes/symbolic "${THEME_DIR}"/mimes + cp -r "${SRC_DIR}"/src/devices/{16,22,24,symbolic} "${THEME_DIR}"/devices + cp -r "${SRC_DIR}"/src/places/{16,22,24,scalable,symbolic} "${THEME_DIR}"/places + cp -r "${SRC_DIR}"/src/status/symbolic "${THEME_DIR}"/status + + mv -f "${THEME_DIR}"/places/scalable/user-trash-dark.svg "${THEME_DIR}"/places/scalable/user-trash.svg + mv -f "${THEME_DIR}"/places/scalable/user-trash-full-dark.svg "${THEME_DIR}"/places/scalable/user-trash-full.svg if [[ ${bold:-} == 'true' ]]; then - cp -r "${SRC_DIR}"/bold/* ${THEME_DIR} + cp -r "${SRC_DIR}"/bold/* "${THEME_DIR}" fi if [[ ${alternative:-} == 'true' ]]; then - cp -r "${SRC_DIR}"/alternative/apps/symbolic/*.svg ${THEME_DIR}/apps/symbolic + cp -r "${SRC_DIR}"/alternative/apps/symbolic/*.svg "${THEME_DIR}"/apps/symbolic fi if [[ $DESKTOP_SESSION == '/usr/share/xsessions/budgie-desktop' ]]; then - cp -r "${SRC_DIR}"/src/status/symbolic-budgie/*.svg ${THEME_DIR}/status/symbolic + cp -r "${SRC_DIR}"/src/status/symbolic-budgie/*.svg "${THEME_DIR}"/status/symbolic fi # Change icon color for dark theme @@ -142,13 +147,13 @@ install() { sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/actions/32/* sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/{actions,apps,categories,emblems,devices,mimes,places,status}/symbolic/* - cp -r "${SRC_DIR}"/links/actions/{16,22,24,32,symbolic} ${THEME_DIR}/actions - cp -r "${SRC_DIR}"/links/devices/{16,22,24,symbolic} ${THEME_DIR}/devices - cp -r "${SRC_DIR}"/links/places/{16,22,24,symbolic} ${THEME_DIR}/places - cp -r "${SRC_DIR}"/links/status/symbolic ${THEME_DIR}/status - cp -r "${SRC_DIR}"/links/apps/symbolic ${THEME_DIR}/apps - cp -r "${SRC_DIR}"/links/categories/symbolic ${THEME_DIR}/categories - cp -r "${SRC_DIR}"/links/mimes/symbolic ${THEME_DIR}/mimes + cp -r "${SRC_DIR}"/links/actions/{16,22,24,32,symbolic} "${THEME_DIR}"/actions + cp -r "${SRC_DIR}"/links/devices/{16,22,24,symbolic} "${THEME_DIR}"/devices + cp -r "${SRC_DIR}"/links/places/{16,22,24,scalable,symbolic} "${THEME_DIR}"/places + cp -r "${SRC_DIR}"/links/status/symbolic "${THEME_DIR}"/status + cp -r "${SRC_DIR}"/links/apps/symbolic "${THEME_DIR}"/apps + cp -r "${SRC_DIR}"/links/categories/symbolic "${THEME_DIR}"/categories + cp -r "${SRC_DIR}"/links/mimes/symbolic "${THEME_DIR}"/mimes cd ${dest} ln -s ../${name}${theme}/animations ${name}${theme}-dark/animations @@ -161,7 +166,6 @@ install() { ln -s ../../${name}${theme}/mimes/scalable ${name}${theme}-dark/mimes/scalable ln -s ../../${name}${theme}/apps/scalable ${name}${theme}-dark/apps/scalable ln -s ../../${name}${theme}/devices/scalable ${name}${theme}-dark/devices/scalable - ln -s ../../${name}${theme}/places/scalable ${name}${theme}-dark/places/scalable ln -s ../${name}${theme}/preferences ${name}${theme}-dark/preferences ln -s ../../${name}${theme}/status/16 ${name}${theme}-dark/status/16 ln -s ../../${name}${theme}/status/22 ${name}${theme}-dark/status/22 @@ -170,7 +174,7 @@ install() { fi ( - cd ${THEME_DIR} + cd "${THEME_DIR}" ln -sf actions actions@2x ln -sf animations animations@2x ln -sf apps apps@2x @@ -183,7 +187,7 @@ install() { ln -sf status status@2x ) - gtk-update-icon-cache ${THEME_DIR} + gtk-update-icon-cache "${THEME_DIR}" } uninstall() { @@ -194,9 +198,9 @@ uninstall() { local THEME_DIR=${dest}/${name}${theme}${color} - [[ -d ${THEME_DIR} ]] && rm -rf ${THEME_DIR} + [[ -d "${THEME_DIR}" ]] && rm -rf "${THEME_DIR}" - echo "Uninstalling '${THEME_DIR}'..." + echo "Uninstalling '"${THEME_DIR}"'..." } while [[ "$#" -gt 0 ]]; do diff --git a/src/places/scalable/user-trash-dark.svg b/src/places/scalable/user-trash-dark.svg new file mode 100644 index 00000000..d15d7a1f --- /dev/null +++ b/src/places/scalable/user-trash-dark.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/places/scalable/user-trash-full-dark.svg b/src/places/scalable/user-trash-full-dark.svg new file mode 100644 index 00000000..56b17b64 --- /dev/null +++ b/src/places/scalable/user-trash-full-dark.svg @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +