From 6bb9a50034d4109f8b3d498540cb0e49f87cd021 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 22 Feb 2016 10:58:56 +0100
Subject: 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.
---
 make_slackware_live.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'make_slackware_live.sh')

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
-- 
cgit v1.2.3