xkbDir=/usr/local/share/X11/xkb

infrastlabs · Nov 3, 2023 · b759a3c · b759a3c
1 parent 186f7c1
commit b759a3c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/compile/src/tigervnc/build.sh b/compile/src/tigervnc/build.sh
@@ -461,11 +461,14 @@ TO_KEEP="
     types/pc
     rules/evdev
 "
-find $XKB_DEST_DIR/usr/share/X11/xkb -mindepth 2 -maxdepth 2 -type d -print -exec rm -r {} ';'
-find $XKB_DEST_DIR/usr/share/X11/xkb -mindepth 1 ! -type d $(printf "! -wholename $XKB_DEST_DIR/usr/share/X11/xkb/%s " $(echo "$TO_KEEP")) -print -delete
+
+# alpine: Installing /tmp/xkb/types/README to /tmp/xkb-install/usr/local/share/X11/xkb/types
+xkbDir=/usr/local/share/X11/xkb
+find $XKB_DEST_DIR$xkbDir -mindepth 2 -maxdepth 2 -type d -print -exec rm -r {} ';'
+find $XKB_DEST_DIR$xkbDir -mindepth 1 ! -type d $(printf "! -wholename $XKB_DEST_DIR$xkbDir/%s " $(echo "$TO_KEEP")) -print -delete
 # +
 mkdir -p ${XKB_REF_PATH}/share/X11;
-\cp -a $XKB_DEST_DIR/usr/share/X11/xkb ${XKB_REF_PATH}/share/X11/xkb
+\cp -a $XKB_DEST_DIR$xkbDir ${XKB_REF_PATH}/share/X11/xkb
 }
 
 #