jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #98426 from romildo/fix.hicolor-icon-theme

Browse Source 
hicolor-icon-theme: fix quoting shell variables in setup hook
This commit is contained in:
José Romildo Malaquias 2020-09-30 10:54:45 -03:00 committed by GitHub
commit d6a12e8d9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/data/icons/hicolor-icon-theme/setup-hook.sh
View File

@ -28,17 +28,17 @@ symlinkParentIconThemes() {
theme_name="${theme%/*}" theme_name="${theme%/*}"
theme_name="${theme_name##*/}" theme_name="${theme_name##*/}"
echo " theme: $theme_name" echo " theme: $theme_name"
inheritance=$(sed -rne 's,^Inherits=(.*)$,\1,p' $theme) inheritance=$(sed -rne 's,^Inherits=(.*)$,\1,p' "$theme")
IFS=',' read -ra parent_themes <<< "$inheritance" IFS=',' read -ra parent_themes <<< "$inheritance"
for parent_theme in "${parent_themes[@]}"; do for parent_theme in "${parent_themes[@]}"; do
parent_path="" parent_path=""
if [ -e "$out/share/icons/$parent_theme" ]; then if [ -e "$out/share/icons/$parent_theme" ]; then
parent_path="$(realpath $out/share/icons/$parent_theme)" parent_path="$(realpath "$out/share/icons/$parent_theme")"
else else
IFS=':' read -ra dirs <<< $XDG_ICON_DIRS IFS=':' read -ra dirs <<< $XDG_ICON_DIRS
for parent_dir in "${dirs[@]}"; do for parent_dir in "${dirs[@]}"; do
if [ -e "$parent_dir/icons/$parent_theme/index.theme" ]; then if [ -e "$parent_dir/icons/$parent_theme/index.theme" ]; then
parent_path=$(realpath "$parent_dir/icons/$parent_theme") parent_path="$(realpath "$parent_dir/icons/$parent_theme")"
ln -s "$parent_path" "$out/share/icons/" ln -s "$parent_path" "$out/share/icons/"
break break
fi fi