Don't reset LIB="lib" when LIB is in environment

It was causing scriptlet failures.

diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
index cc640e5f1094685d5ce18d4eb8d4d0e04b1724e9..d2f1e6d1f3f4a721320cf625ccfbd540c535c7a7 100755 (executable)
--- a/scripts/plymouth-populate-initrd.in
+++ b/scripts/plymouth-populate-initrd.in
@@ -5,7 +5,13 @@
 [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec"
 [ -z "$DATADIR" ] && DATADIR="/usr/share"
 [ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)"
-[ -z "$LIB" ] && $(echo nash-showelfinterp @plymouthclientdir@/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib"
+if [ -z "$LIB" ]; then
+  if $(echo nash-showelfinterp /proc/$$/exe | /sbin/nash --forcequiet | grep -q lib64); then
+    LIB="lib64"
+  else
+    LIB="lib"
+  fi
+fi
 [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
 [ -z "$BINDIR" ] && BINDIR="/usr/bin"
 [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup"

diff --git a/scripts/plymouth-set-default-plugin.in b/scripts/plymouth-set-default-plugin.in
index 5b8870abfe96d915c70257f66db82e6ee31724d7..473221b3ed227b5b38a9257b50123cda637232d9 100755 (executable)
--- a/scripts/plymouth-set-default-plugin.in
+++ b/scripts/plymouth-set-default-plugin.in
@@ -4,7 +4,13 @@ set -e
 
 [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec"
 [ -z "$DATADIR" ] && DATADIR="/usr/share"
-[ -z "$LIB" ] && $(echo nash-showelfinterp /proc/$$/exe | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib"
+if [ -z "$LIB" ]; then
+  if $(echo nash-showelfinterp /proc/$$/exe | /sbin/nash --forcequiet | grep -q lib64); then
+    LIB="lib64"
+  else
+    LIB="lib"
+  fi
+fi
 [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
 [ -z "$BINDIR" ] && BINDIR="/usr/bin"