Unifying shell scripts

This commit is contained in:
Pierre Pronchery 2012-10-07 01:09:58 +00:00
parent 6aabbf6d70
commit af65c343b3
3 changed files with 18 additions and 17 deletions

View File

@ -27,7 +27,7 @@ _create_directories()
echo -n "Creating missing directories:" echo -n "Creating missing directories:"
while true; do while true; do
echo -n " $1" echo -n " $1"
$MKDIR "$DESTDIR/$1" || exit 2 $MKDIR -- "$DESTDIR/$1" || exit 2
shift || break shift || break
done done
echo echo

View File

@ -27,7 +27,7 @@ _image_image_pre()
check "$USAGE" DD DESTDIR DEVZERO IMAGE_FILE IMAGE_KERNEL IMAGE_SIZE \ check "$USAGE" DD DESTDIR DEVZERO IMAGE_FILE IMAGE_KERNEL IMAGE_SIZE \
MKDIR MKFS MOUNT UMOUNT MKDIR MKFS MOUNT UMOUNT
$MKDIR "$DESTDIR" || exit 2 $MKDIR -- "$DESTDIR" || exit 2
$UMOUNT "$DESTDIR" $UMOUNT "$DESTDIR"
$DD if="$DEVZERO" of="$IMAGE_FILE" count="$IMAGE_SIZE" && $DD if="$DEVZERO" of="$IMAGE_FILE" count="$IMAGE_SIZE" &&
$MKFS "$IMAGE_FILE" || exit 2 $MKFS "$IMAGE_FILE" || exit 2
@ -56,13 +56,13 @@ _image_iso_pre()
check "$USAGE" CAT DESTDIR KERNEL IMAGE_FILE IMAGE_KERNEL INSTALL \ check "$USAGE" CAT DESTDIR KERNEL IMAGE_FILE IMAGE_KERNEL INSTALL \
MKDIR MKISOFS RAMDISK TAR MKDIR MKISOFS RAMDISK TAR
$MKDIR "$DESTDIR" || exit 2 $MKDIR -- "$DESTDIR" || exit 2
} }
_image_iso_post() _image_iso_post()
{ {
#install kernel with ramdisk and modules #install kernel with ramdisk and modules
$MKDIR "$DESTDIR/boot" || exit 2 $MKDIR -- "$DESTDIR/boot" || exit 2
$INSTALL -m 755 "$IMAGE_KERNEL" "$DESTDIR/$KERNEL" || exit 2 $INSTALL -m 755 "$IMAGE_KERNEL" "$DESTDIR/$KERNEL" || exit 2
if [ ! -z "$IMAGE_RAMDISK" ]; then if [ ! -z "$IMAGE_RAMDISK" ]; then
$INSTALL -m 644 "$IMAGE_RAMDISK" "$DESTDIR/$RAMDISK" $INSTALL -m 644 "$IMAGE_RAMDISK" "$DESTDIR/$RAMDISK"
@ -72,7 +72,7 @@ _image_iso_post()
(cd "$DESTDIR" && $TAR -xzf -) (cd "$DESTDIR" && $TAR -xzf -)
#setup bootloader #setup bootloader
$MKDIR "$DESTDIR/boot/grub" || exit 2 $MKDIR -- "$DESTDIR/boot/grub" || exit 2
$INSTALL -m 644 "/usr/lib/grub/i386-pc/stage2_eltorito" \ $INSTALL -m 644 "/usr/lib/grub/i386-pc/stage2_eltorito" \
"$DESTDIR/boot/grub" || exit 2 "$DESTDIR/boot/grub" || exit 2
$CAT > "$DESTDIR/boot/grub/menu.lst" << EOF $CAT > "$DESTDIR/boot/grub/menu.lst" << EOF
@ -102,7 +102,7 @@ _image_ramdisk_pre()
check "$USAGE" DD DESTDIR DEVZERO DU GENEXT2FS GZIP IMAGE_FILE \ check "$USAGE" DD DESTDIR DEVZERO DU GENEXT2FS GZIP IMAGE_FILE \
IMAGE_SIZE INSTALL LN MKDIR MKFS MV IMAGE_SIZE INSTALL LN MKDIR MKFS MV
$MKDIR "$DESTDIR" || exit 2 $MKDIR -- "$DESTDIR" || exit 2
} }
_image_ramdisk_post() _image_ramdisk_post()

View File

@ -40,7 +40,7 @@ _image_image_pre()
IMAGE_SIZE INSTALL INSTALLBOOT LDSO LN MBRLABEL MKDIR MKFS \ IMAGE_SIZE INSTALL INSTALLBOOT LDSO LN MBRLABEL MKDIR MKFS \
MKNOD MOUNT MV UMOUNT VNCONFIG VND MKNOD MOUNT MV UMOUNT VNCONFIG VND
$MKDIR "$DESTDIR" || exit 2 $MKDIR -- "$DESTDIR" || exit 2
$SUDO $UMOUNT "$DESTDIR" $SUDO $UMOUNT "$DESTDIR"
$SUDO $VNCONFIG -u "$VND" $SUDO $VNCONFIG -u "$VND"
$DD if="$DEVZERO" of="$IMAGE_FILE" count="$IMAGE_SIZE" && $DD if="$DEVZERO" of="$IMAGE_FILE" count="$IMAGE_SIZE" &&
@ -53,15 +53,15 @@ _image_image_pre()
$SUDO $MKFS "${VND}e" && $SUDO $MKFS "${VND}e" &&
$SUDO $MOUNT "/dev/${VND}e" "$DESTDIR" && $SUDO $MOUNT "/dev/${VND}e" "$DESTDIR" &&
$SUDO $CHOWN "$UID:$GID" "$DESTDIR" && $SUDO $CHOWN "$UID:$GID" "$DESTDIR" &&
$MKDIR "$DESTDIR$PREFIX" $MKDIR -- "$DESTDIR$PREFIX"
} }
_image_image_post() _image_image_post()
{ {
$SUDO $CHOWN -R "0:0" "$DESTDIR" && $SUDO $CHOWN -R "0:0" "$DESTDIR" &&
$SUDO $MKDIR "$DESTDIR/bin" && $SUDO $MKDIR -- "$DESTDIR/bin" &&
$SUDO $MV "$DESTDIR$PREFIX/bin/sh" "$DESTDIR/bin/sh" && $SUDO $MV "$DESTDIR$PREFIX/bin/sh" "$DESTDIR/bin/sh" &&
$SUDO $MKDIR "$DESTDIR/dev" && $SUDO $MKDIR -- "$DESTDIR/dev" &&
$SUDO $MKNOD -m 600 "$DESTDIR/dev/console" c 0 0 && $SUDO $MKNOD -m 600 "$DESTDIR/dev/console" c 0 0 &&
$SUDO $MKNOD -m 600 "$DESTDIR/dev/hd0a" b 0 0 && $SUDO $MKNOD -m 600 "$DESTDIR/dev/hd0a" b 0 0 &&
$SUDO $MKNOD -m 600 "$DESTDIR/dev/hd0b" b 0 1 && $SUDO $MKNOD -m 600 "$DESTDIR/dev/hd0b" b 0 1 &&
@ -79,13 +79,14 @@ _image_image_post()
$SUDO $MKNOD -m 600 "$DESTDIR/dev/rhd0f" c 3 5 && $SUDO $MKNOD -m 600 "$DESTDIR/dev/rhd0f" c 3 5 &&
$SUDO $MKNOD -m 600 "$DESTDIR/dev/rhd0g" c 3 6 && $SUDO $MKNOD -m 600 "$DESTDIR/dev/rhd0g" c 3 6 &&
$SUDO $MKNOD -m 600 "$DESTDIR/dev/rhd0h" c 3 7 && $SUDO $MKNOD -m 600 "$DESTDIR/dev/rhd0h" c 3 7 &&
$SUDO $MKDIR "$DESTDIR/etc" && $SUDO $MKDIR -- "$DESTDIR/etc" &&
$SUDO $MKDIR "$DESTDIR/libexec" "$DESTDIR/usr/libexec" && $SUDO $MKDIR -- "$DESTDIR/libexec" \
"$DESTDIR/usr/libexec" &&
$SUDO $INSTALL -m 555 "$LDSO" \ $SUDO $INSTALL -m 555 "$LDSO" \
"$DESTDIR/libexec/ld.elf_so" && "$DESTDIR/libexec/ld.elf_so" &&
$SUDO $LN -s "/libexec/ld.elf_so" "$DESTDIR/usr/libexec"&& $SUDO $LN -s "/libexec/ld.elf_so" "$DESTDIR/usr/libexec"&&
$SUDO $MKDIR "$DESTDIR/proc" && $SUDO $MKDIR -- "$DESTDIR/proc" &&
$SUDO $MKDIR "$DESTDIR/sbin" && $SUDO $MKDIR -- "$DESTDIR/sbin" &&
SUBDIRS="Apps/Unix/src/others/tools" target oinit && SUBDIRS="Apps/Unix/src/others/tools" target oinit &&
$SUDO $INSTALL -m 755 "Apps/Unix/src/others/tools/oinit" \ $SUDO $INSTALL -m 755 "Apps/Unix/src/others/tools/oinit" \
"$DESTDIR/sbin/init" && "$DESTDIR/sbin/init" &&
@ -140,12 +141,12 @@ _image_iso_pre()
_image_iso_post() _image_iso_post()
{ {
$MKDIR "$DESTDIR/dev" || exit 2 $MKDIR -- "$DESTDIR/dev" || exit 2
$SUDO $MKNOD -m 600 "$DESTDIR/dev/console" c 0 0 || exit 2 $SUDO $MKNOD -m 600 "$DESTDIR/dev/console" c 0 0 || exit 2
$MKDIR "$DESTDIR/libexec" "$DESTDIR/usr/libexec" || exit 2 $MKDIR -- "$DESTDIR/libexec" "$DESTDIR/usr/libexec" || exit 2
$INSTALL -m 555 "$LDSO" "$DESTDIR/libexec/ld.elf_so" || exit 2 $INSTALL -m 555 "$LDSO" "$DESTDIR/libexec/ld.elf_so" || exit 2
$LN -s "/libexec/ld.elf_so" "$DESTDIR/usr/libexec" || exit 2 $LN -s "/libexec/ld.elf_so" "$DESTDIR/usr/libexec" || exit 2
$MKDIR "$DESTDIR/sbin" || exit 2 $MKDIR -- "$DESTDIR/sbin" || exit 2
SUBDIRS="Apps/Unix/src/others/tools" target oinit || exit 2 SUBDIRS="Apps/Unix/src/others/tools" target oinit || exit 2
$INSTALL -m 755 "Apps/Unix/src/others/tools/oinit" \ $INSTALL -m 755 "Apps/Unix/src/others/tools/oinit" \
"$DESTDIR/sbin/init" || exit 2 "$DESTDIR/sbin/init" || exit 2