diff options
author | Eric Hameleers <alien@slackware.com> | 2016-05-17 20:43:13 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-05-17 20:43:13 +0200 |
commit | 0131eed89a86c11d9223c056f280bf8bd5760f7e (patch) | |
tree | 6ad16c0f05dfe7279699dbb85d654b662a9e1cb3 | |
parent | 83478373d86136cfc08e1149b2d560fb5e657593 (diff) | |
download | liveslak-0131eed89a86c11d9223c056f280bf8bd5760f7e.tar.gz liveslak-0131eed89a86c11d9223c056f280bf8bd5760f7e.tar.xz |
Fix logic errors in 'if' statements when looking for wildcard files.
-rwxr-xr-x | make_slackware_live.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 81b96ea..5a82823 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1830,12 +1830,12 @@ else fi # Copy our stockpile of add-on modules into place: -if [ -f ${LIVE_TOOLDIR}/addons/*.sxz ]; then +if ls ${LIVE_TOOLDIR}/addons/*.sxz 1>/dev/null 2>&1 ; then cp ${LIVE_TOOLDIR}/addons/*.sxz ${LIVE_MOD_ADD}/ fi # If we have optionals, copy those too: -if [ -f ${LIVE_TOOLDIR}/optional/*.sxz ]; then +if ls ${LIVE_TOOLDIR}/optional/*.sxz 1>/dev/null 2>&1 ; then cp ${LIVE_TOOLDIR}/optional/*.sxz ${LIVE_MOD_OPT}/ fi @@ -1844,7 +1844,7 @@ if [ "$LIVEDE" != "XFCE" -a "$LIVEDE" != "SLACKWARE" ]; then # however the SLACKWARE ISO should not have any non-Slackware content. # You can 'cheat' when building the SLACKWARE ISO by copying the graphics # drivers into the 'optional' directory yourself. - if [ -f ${LIVE_TOOLDIR}/graphics/*${KVER}-*.sxz ]; then + if ls ${LIVE_TOOLDIR}/graphics/*${KVER}-*.sxz 1>/dev/null 2>&1 ; then # Add custom (proprietary) graphics drivers: echo "-- Adding binary GPU drivers supporting kernel ${KVER}." cp ${LIVE_TOOLDIR}/graphics/*${KVER}-*.sxz ${LIVE_MOD_OPT}/ |