New commits:
commit e7223d08ca10cf808a04003692977e1437bddb38
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
scripts/mkrelease.sh: set the MYDIR variable
Set the MYDIR variable used when calling other scripts.
commit b6e6f37b2a6c8db1d5bc2c2ad84330ec805d8fdd
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
scripts/cleaniso.sh: more cleaning, abs. cmd paths
Added more directories to clean out from the ISO, and changed the chroot
commands to use absolute command paths to rm and rmdir.
commit ed956dbb3e9548b67c91a0a8a9c607dcbde77149
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
scrips/mkrelease.sh: fix handling of CHOWN
Needed to branch the CHOWN stuff since chown would complain if the
variables were empty. Now the chown run is completely avoided unless
specifically passed in.
diff --git a/scripts/cleaniso.sh b/scripts/cleaniso.sh
index 769ee27..0ec4b53 100755
--- a/scripts/cleaniso.sh
+++ b/scripts/cleaniso.sh
@@ -100,13 +100,25 @@ do
then
# chroot and clean a directory using rmdir
echo "Attempting to remove directory
$ISOCHROOT/$DIRT"
- chroot "$ISOCHROOT" rmdir
--ignore-fail-on-non-empty "$DIRT"
+ chroot "$ISOCHROOT" /bin/rmdir
--ignore-fail-on-non-empty "$DIRT"
else
# chroot and clean an individual file
echo "Attempting to delete $ISOCHROOT/$DIRT"
- chroot "$ISOCHROOT" rm -f "$DIRT"
+ chroot "$ISOCHROOT" /bin/rm -f "$DIRT"
fi
fi
done
done