summaryrefslogtreecommitdiffstats
path: root/make_slackware_live.sh
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-02-22 10:58:56 +0100
committer Eric Hameleers <alien@slackware.com>2016-02-22 10:58:56 +0100
commit6bb9a50034d4109f8b3d498540cb0e49f87cd021 (patch)
tree98eec7b27843a25007347f902f26928709b352e5 /make_slackware_live.sh
parent3a551bb250d808bb53c6b278272e83c9d71c9fc9 (diff)
downloadliveslak-6bb9a50034d4109f8b3d498540cb0e49f87cd021.tar.gz
liveslak-6bb9a50034d4109f8b3d498540cb0e49f87cd021.tar.xz
Make this chroot code look easier to interpret by the human eye.
The script was mixing relative and absolute paths which is confusing. In the chroot, we do not have to work with relative paths as is the case with some original Slackware scripts.
Diffstat (limited to 'make_slackware_live.sh')
-rwxr-xr-xmake_slackware_live.sh22
1 files changed, 11 insertions, 11 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 8aed168..0acedcf 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1297,41 +1297,41 @@ EOCR
chroot "${LIVE_ROOTDIR}" /bin/bash <<EOCR
# Update the desktop database:
-if [ -x usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>${DBGOUT}
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>${DBGOUT}
fi
# Update hicolor theme cache:
-if [ -d usr/share/icons/hicolor ]; then
+if [ -d /usr/share/icons/hicolor ]; then
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1>/dev/null 2>${DBGOUT}
+ /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor 1>/dev/null 2>${DBGOUT}
fi
fi
# Update the mime database:
-if [ -x usr/bin/update-mime-database ]; then
- /usr/bin/update-mime-database usr/share/mime >/dev/null 2>${DBGOUT}
+if [ -x /usr/bin/update-mime-database ]; then
+ /usr/bin/update-mime-database /usr/share/mime >/dev/null 2>${DBGOUT}
fi
# Font configuration:
-if [ -x usr/bin/fc-cache ]; then
+if [ -x /usr/bin/fc-cache ]; then
for fontdir in 100dpi 75dpi OTF Speedo TTF Type1 cyrillic ; do
- if [ -d usr/share/fonts/$fontdir ]; then
+ if [ -d /usr/share/fonts/$fontdir ]; then
mkfontscale /usr/share/fonts/$fontdir 1>/dev/null 2>${DBGOUT}
mkfontdir /usr/share/fonts/$fontdir 1>/dev/null 2>${DBGOUT}
fi
done
- if [ -d usr/share/fonts/misc ]; then
+ if [ -d /usr/share/fonts/misc ]; then
mkfontscale /usr/share/fonts/misc 1>/dev/null 2>${DBGOUT}
mkfontdir -e /usr/share/fonts/encodings -e /usr/share/fonts/encodings/large /usr/share/fonts/misc 1>/dev/null 2>${DBGOUT}
fi
/usr/bin/fc-cache -f 1>/dev/null 2>${DBGOUT}
fi
-if [ -x usr/bin/update-gtk-immodules ]; then
+if [ -x /usr/bin/update-gtk-immodules ]; then
/usr/bin/update-gtk-immodules
fi
-if [ -x usr/bin/update-gdk-pixbuf-loaders ]; then
+if [ -x /usr/bin/update-gdk-pixbuf-loaders ]; then
/usr/bin/update-gdk-pixbuf-loaders
fi
if [ -x /usr/bin/update-pango-querymodules ]; then