if [[ $UID -ne 0 ]]
then
if [[ -x $(which sudo > /dev/null) ]]
then
- SUDOCMD="sudo"
+ exec sudo "$SELF $*"
else
echo "Please enter the root password."
exec su -c "$SELF $*" root
@@ -78,19 +77,19 @@ fi >&2
# make sure we start with a clean TEMPDIR each run
-$SUDOCMD rm -rf $TEMPDIR
-$SUDOCMD mkdir -m 0700 $TEMPDIR
+ rm -rf $TEMPDIR
+ mkdir -m 0700 $TEMPDIR
# add the contents of base, which are files that
# should go onto both iso and system chroots
# this is mostly /etc content
-$SUDOCMD cp -a $MYDIR/base/* $TEMPDIR/
+ cp -a $MYDIR/base/* $TEMPDIR/
# ISO Sauce
if [[ $TYPE == "iso" ]] ;then
# copy everything from the cauldron repo iso dir
# into the TEMPDIR staging area
- $SUDOCMD cp -a $MYDIR/iso/* $TEMPDIR/
+ cp -a $MYDIR/iso/* $TEMPDIR/
fi
# System Sauce
@@ -99,13 +98,13 @@ then
# make sure that the grub stage files are available in /boot
# by copying them from CHROOTDIR (system) into the /boot dir
# in our TEMPDIR staging area
- $SUDOCMD cp -a $CHROOTDIR/usr/lib/grub/i386-pc/* $TEMPDIR/boot/grub/
+ cp -a $CHROOTDIR/usr/lib/grub/i386-pc/* $TEMPDIR/boot/grub/
fi
# Get a list of all files we want to install
@@ -116,7 +115,7 @@ do
# This is safe even if the dir already exists
if [[ -d $i ]]
then
- $SUDOCMD mkdir -p $CHROOTDIR/$FILE
+ mkdir -p $CHROOTDIR/$FILE
continue
fi
@@ -136,12 +135,12 @@ do
echo ""
if [[ $OVERWRITE == y ]]
then
- $SUDOCMD cp -a $TEMPDIR/$FILE $CHROOTDIR/$FILE
+ cp -a $TEMPDIR/$FILE $CHROOTDIR/$FILE
fi
else
- $SUDOCMD cp -a $TEMPDIR/$FILE $CHROOTDIR/$FILE
+ cp -a $TEMPDIR/$FILE $CHROOTDIR/$FILE
fi
done
if [[ $UID -ne 0 ]]
then
if [[ -x $(which sudo > /dev/null) ]]
then
- SUDOCMD="sudo"
+ exec sudo "$SELF $*"
else
echo "Please enter the root password."
exec su -c "$SELF $*" root
@@ -59,12 +58,12 @@ CHROOT_DIR="${CHROOT_DIR:-.}"
[[ $# -gt 0 ]] && CHROOT_CMD="$@"
CHROOT_CMD="${CHROOT_CMD:-/bin/bash -l}"
-$SUDOCMD mount --bind /dev "$CHROOT_DIR"/dev
-$SUDOCMD mount --bind /dev/pts "$CHROOT_DIR"/dev/pts
-$SUDOCMD mount --bind /proc "$CHROOT_DIR"/proc
+ mount --bind /dev "$CHROOT_DIR"/dev
+ mount --bind /dev/pts "$CHROOT_DIR"/dev/pts
+ mount --bind /proc "$CHROOT_DIR"/proc
if [[ $UID -ne 0 ]]
then
if [[ -x $(which sudo > /dev/null) ]]
then
- SUDOCMD="sudo"
+ exec sudo "$SELF $*"
else
echo "Please enter the root password."
exec su -c "$SELF $*" root
@@ -62,10 +61,10 @@ GRIMOIRE_VER=$(<
"$TARGET"/var/lib/sorcery/codex/stable/VERSION)
for file in $(grep -qr '@ISO_VERSION@'
$TARGET/{etc,isolinux,usr/share/doc/smgl.install}/*)
do
- $SUDOCMD sed -i "s/@ISO_VERSION@/$VERSION/" "$file"
+ sed -i "s/@ISO_VERSION@/$VERSION/" "$file"
done
-$SUDOCMD sed -i "s/@GRIMOIRE_VERSION@/$GRIMOIRE_VER/"
"$TARGET"/isolinux/isolinux.msg
+ sed -i "s/@GRIMOIRE_VERSION@/$GRIMOIRE_VER/" "$TARGET"/isolinux/isolinux.msg