Skip to content

Commit ce7bd24

Browse files
committed
update
1 parent 4c990e5 commit ce7bd24

21 files changed

+288
-255
lines changed

install.sh

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,30 @@ install_theme() {
212212
local THEME_DIR="${DEST_DIR}/${THEME_NAME}"
213213

214214
local TMP_DIR="${THEME_DIR}.tmp.$$"
215-
safe_rm_dir "${TMP_DIR}"
215+
safe_rm_dir "${THEME_DIR}.tmp*"
216216
ensure_dir "${TMP_DIR}"
217217

218+
case "$color" in
219+
standard)
220+
theme_color='#198ee6' ;;
221+
purple)
222+
theme_color='#dc63ee' ;;
223+
pink)
224+
theme_color='#ff5c93' ;;
225+
red)
226+
theme_color='#ff6666' ;;
227+
orange)
228+
theme_color='#ff9c33' ;;
229+
yellow)
230+
theme_color='#ffcb52' ;;
231+
green)
232+
theme_color='#67cb6b' ;;
233+
teal)
234+
theme_color='#32c8ba' ;;
235+
grey)
236+
theme_color='#808080' ;;
237+
esac
238+
218239
echo "Installing '${THEME_NAME}'..."
219240

220241
install_file 644 "${SRC_DIR}/src/index.theme" "${TMP_DIR}/index.theme"
@@ -233,13 +254,11 @@ install_theme() {
233254
done
234255
for sub in apps places; do
235256
ensure_dir "${TMP_DIR}/scalable/${sub}"
236-
[ -d "${SHARED_BASE}/scalable/${sub}" ] && cp -r "${SHARED_BASE}/scalable/${sub}/." "${TMP_DIR}/scalable/${sub}/"
257+
merge_copy "${SRC_DIR}/src/scalable/${sub}" "${TMP_DIR}/scalable/${sub}"
258+
safe_sed_replace "#198ee6" "${theme_color}" "${TMP_DIR}/scalable/${sub}/*.svg"
259+
merge_copy "${SRC_DIR}/links/scalable/${sub}" "${TMP_DIR}/scalable/${sub}"
237260
done
238-
local COLOR_DIR="${SRC_DIR}/colors/color-${color}"
239-
[ -d "${COLOR_DIR}/places" ] && install -m644 "${COLOR_DIR}/places/"*.svg "${TMP_DIR}/scalable/places" 2>/dev/null || true
240-
[ -d "${COLOR_DIR}/apps" ] && install -m644 "${COLOR_DIR}/apps/"*.svg "${TMP_DIR}/scalable/apps" 2>/dev/null || true
241261
fi
242-
243262
elif [ "${bright}" = "light" ]; then
244263
local STD_THEME_DIR="${DEST_DIR}/${NAME}${colorprefix}"
245264
for sz in 16 22 24; do

src/scalable/apps/cinnamon-panel-launcher.svg

Lines changed: 10 additions & 13 deletions
Loading
Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)