mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 23:57:34 +00:00
POSIX compliance: (most) shell scripts converted to generic shell
Ports/.port_include.sh, Toolchain/BuildIt.sh, Toolchain/UseIt.sh have been left largely untouched due to use of Bash-exclusive functions and variables such as $BASH_SOURCE, pushd and popd.
This commit is contained in:
George Pickering
Andreas Kling
parent
2cc5f3a93f
commit
704f48d7f3
43 changed files with 152 additions and 144 deletions
|
|
@ -1,19 +1,19 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
die() {
|
||||
echo "die: $@"
|
||||
echo "die: $*"
|
||||
exit 1
|
||||
}
|
||||
|
||||
if [ $(id -u) != 0 ]; then
|
||||
if [ "$(id -u)" != 0 ]; then
|
||||
die "this script needs to run as root"
|
||||
fi
|
||||
|
||||
grub=$(which grub-install 2>/dev/null) || true
|
||||
if [[ -z "$grub" ]]; then
|
||||
grub=$(which grub2-install 2>/dev/null) || true
|
||||
grub=$(command -v grub-install 2>/dev/null) || true
|
||||
if [ -z "$grub" ]; then
|
||||
grub=$(command -v grub2-install 2>/dev/null) || true
|
||||
fi
|
||||
if [ -z "$grub" ]; then
|
||||
echo "can't find a grub-install or grub2-install binary, oh no"
|
||||
|
|
@ -22,58 +22,58 @@ fi
|
|||
echo "using grub-install at ${grub}"
|
||||
|
||||
echo "setting up disk image..."
|
||||
dd if=/dev/zero of=_disk_image bs=1M count=${DISK_SIZE:-701} status=none || die "couldn't create disk image"
|
||||
dd if=/dev/zero of=_disk_image bs=1M count="${DISK_SIZE:-701}" status=none || die "couldn't create disk image"
|
||||
chown 1000:1000 _disk_image || die "couldn't adjust permissions on disk image"
|
||||
echo "done"
|
||||
|
||||
echo -n "creating loopback device... "
|
||||
printf "creating loopback device... "
|
||||
dev=$(losetup --find --partscan --show _disk_image)
|
||||
if [ -z $dev ]; then
|
||||
if [ -z "$dev" ]; then
|
||||
die "couldn't mount loopback device"
|
||||
fi
|
||||
echo "loopback device is at ${dev}"
|
||||
|
||||
cleanup() {
|
||||
if [ -d mnt ]; then
|
||||
echo -n "unmounting filesystem... "
|
||||
printf "unmounting filesystem... "
|
||||
umount mnt || ( sleep 1 && sync && umount mnt )
|
||||
rm -rf mnt
|
||||
echo "done"
|
||||
fi
|
||||
|
||||
if [ -e ${dev} ]; then
|
||||
echo -n "cleaning up loopback device... "
|
||||
losetup -d ${dev}
|
||||
if [ -e "${dev}" ]; then
|
||||
printf "cleaning up loopback device... "
|
||||
losetup -d "${dev}"
|
||||
echo "done"
|
||||
fi
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
echo -n "creating partition table... "
|
||||
parted -s ${dev} mklabel gpt mkpart BIOSBOOT ext3 1MiB 8MiB mkpart OS ext2 8MiB 700MiB set 1 bios_grub || die "couldn't partition disk"
|
||||
printf "creating partition table... "
|
||||
parted -s "${dev}" mklabel gpt mkpart BIOSBOOT ext3 1MiB 8MiB mkpart OS ext2 8MiB 700MiB set 1 bios_grub || die "couldn't partition disk"
|
||||
echo "done"
|
||||
|
||||
echo -n "destroying old filesystem... "
|
||||
dd if=/dev/zero of=${dev}p2 bs=1M count=1 status=none || die "couldn't destroy old filesystem"
|
||||
printf "destroying old filesystem... "
|
||||
dd if=/dev/zero of="${dev}"p2 bs=1M count=1 status=none || die "couldn't destroy old filesystem"
|
||||
echo "done"
|
||||
|
||||
echo -n "creating new filesystem... "
|
||||
mke2fs -q ${dev}p2 || die "couldn't create filesystem"
|
||||
printf "creating new filesystem... "
|
||||
mke2fs -q "${dev}"p2 || die "couldn't create filesystem"
|
||||
echo "done"
|
||||
|
||||
echo -n "mounting filesystem... "
|
||||
printf "mounting filesystem... "
|
||||
mkdir -p mnt
|
||||
mount ${dev}p2 mnt/ || die "couldn't mount filesystem"
|
||||
mount "${dev}"p2 mnt/ || die "couldn't mount filesystem"
|
||||
echo "done"
|
||||
|
||||
./build-root-filesystem.sh
|
||||
|
||||
echo -n "creating /boot... "
|
||||
printf "creating /boot... "
|
||||
mkdir -p mnt/boot
|
||||
echo "done"
|
||||
|
||||
echo "installing grub using $grub..."
|
||||
$grub --boot-directory=mnt/boot --target=i386-pc --modules="ext2 part_msdos part_gpt" ${dev}
|
||||
$grub --boot-directory=mnt/boot --target=i386-pc --modules="ext2 part_msdos part_gpt ${dev}"
|
||||
|
||||
if [ -d mnt/boot/grub2 ]; then
|
||||
cp grub_gpt.cfg mnt/boot/grub2/grub.cfg
|
||||
|
|
@ -82,6 +82,6 @@ else
|
|||
fi
|
||||
echo "done"
|
||||
|
||||
echo -n "installing kernel in /boot... "
|
||||
printf "installing kernel in /boot... "
|
||||
cp kernel mnt/boot
|
||||
echo "done"
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
die() {
|
||||
echo "die: $@"
|
||||
echo "die: $*"
|
||||
exit 1
|
||||
}
|
||||
|
||||
if [ $(id -u) != 0 ]; then
|
||||
if [ "$(id -u)" != 0 ]; then
|
||||
die "this script needs to run as root"
|
||||
fi
|
||||
|
||||
grub=$(which grub-install 2>/dev/null) || true
|
||||
if [[ -z "$grub" ]]; then
|
||||
grub=$(which grub2-install 2>/dev/null) || true
|
||||
grub=$(command -v grub-install 2>/dev/null) || true
|
||||
if [ -z "$grub" ]; then
|
||||
grub=$(command -v grub2-install 2>/dev/null) || true
|
||||
fi
|
||||
if [ -z "$grub" ]; then
|
||||
echo "can't find a grub-install or grub2-install binary, oh no"
|
||||
|
|
@ -22,58 +22,58 @@ fi
|
|||
echo "using grub-install at ${grub}"
|
||||
|
||||
echo "setting up disk image..."
|
||||
dd if=/dev/zero of=_disk_image bs=1M count=${DISK_SIZE:-500} status=none || die "couldn't create disk image"
|
||||
dd if=/dev/zero of=_disk_image bs=1M count="${DISK_SIZE:-500}" status=none || die "couldn't create disk image"
|
||||
chown 1000:1000 _disk_image || die "couldn't adjust permissions on disk image"
|
||||
echo "done"
|
||||
|
||||
echo -n "creating loopback device... "
|
||||
printf "creating loopback device... "
|
||||
dev=$(losetup --find --partscan --show _disk_image)
|
||||
if [ -z $dev ]; then
|
||||
if [ -z "$dev" ]; then
|
||||
die "couldn't mount loopback device"
|
||||
fi
|
||||
echo "loopback device is at ${dev}"
|
||||
|
||||
cleanup() {
|
||||
if [ -d mnt ]; then
|
||||
echo -n "unmounting filesystem... "
|
||||
printf "unmounting filesystem... "
|
||||
umount mnt || ( sleep 1 && sync && umount mnt )
|
||||
rm -rf mnt
|
||||
echo "done"
|
||||
fi
|
||||
|
||||
if [ -e ${dev} ]; then
|
||||
echo -n "cleaning up loopback device... "
|
||||
losetup -d ${dev}
|
||||
if [ -e "${dev}" ]; then
|
||||
printf "cleaning up loopback device... "
|
||||
losetup -d "${dev}"
|
||||
echo "done"
|
||||
fi
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
echo -n "creating partition table... "
|
||||
parted -s ${dev} mklabel msdos mkpart primary ext2 32k 100% -a minimal set 1 boot on || die "couldn't partition disk"
|
||||
printf "creating partition table... "
|
||||
parted -s "${dev}" mklabel msdos mkpart primary ext2 32k 100% -a minimal set 1 boot on || die "couldn't partition disk"
|
||||
echo "done"
|
||||
|
||||
echo -n "destroying old filesystem... "
|
||||
dd if=/dev/zero of=${dev}p1 bs=1M count=1 status=none || die "couldn't destroy old filesystem"
|
||||
printf "destroying old filesystem... "
|
||||
dd if=/dev/zero of="${dev}"p1 bs=1M count=1 status=none || die "couldn't destroy old filesystem"
|
||||
echo "done"
|
||||
|
||||
echo -n "creating new filesystem... "
|
||||
mke2fs -q -I 128 ${dev}p1 || die "couldn't create filesystem"
|
||||
printf "creating new filesystem... "
|
||||
mke2fs -q -I 128 "${dev}"p1 || die "couldn't create filesystem"
|
||||
echo "done"
|
||||
|
||||
echo -n "mounting filesystem... "
|
||||
printf "mounting filesystem... "
|
||||
mkdir -p mnt
|
||||
mount ${dev}p1 mnt/ || die "couldn't mount filesystem"
|
||||
mount "${dev}"p1 mnt/ || die "couldn't mount filesystem"
|
||||
echo "done"
|
||||
|
||||
./build-root-filesystem.sh
|
||||
|
||||
echo -n "creating /boot... "
|
||||
printf "creating /boot... "
|
||||
mkdir -p mnt/boot
|
||||
echo "done"
|
||||
|
||||
echo "installing grub using $grub..."
|
||||
$grub --boot-directory=mnt/boot --target=i386-pc --modules="ext2 part_msdos" ${dev}
|
||||
$grub --boot-directory=mnt/boot --target=i386-pc --modules="ext2 part_msdos ${dev}"
|
||||
|
||||
if [ -d mnt/boot/grub2 ]; then
|
||||
cp grub.cfg mnt/boot/grub2/grub.cfg
|
||||
|
|
@ -82,6 +82,6 @@ else
|
|||
fi
|
||||
echo "done"
|
||||
|
||||
echo -n "installing kernel in /boot... "
|
||||
printf "installing kernel in /boot... "
|
||||
cp kernel mnt/boot
|
||||
echo "done"
|
||||
|
|
|
|||
|
|
@ -1,33 +1,33 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
die() {
|
||||
echo "die: $@"
|
||||
echo "die: $*"
|
||||
exit 1
|
||||
}
|
||||
|
||||
if [ $(id -u) != 0 ]; then
|
||||
if [ "$(id -u)" != 0 ]; then
|
||||
die "this script needs to run as root"
|
||||
fi
|
||||
|
||||
echo "setting up disk image..."
|
||||
qemu-img create _disk_image ${DISK_SIZE:-500}m || die "couldn't create disk image"
|
||||
chown $build_user:$build_group _disk_image || die "couldn't adjust permissions on disk image"
|
||||
qemu-img create _disk_image "${DISK_SIZE:-500}"m || die "couldn't create disk image"
|
||||
chown "$build_user":"$build_group" _disk_image || die "couldn't adjust permissions on disk image"
|
||||
echo "done"
|
||||
|
||||
echo -n "creating new filesystem... "
|
||||
printf "creating new filesystem... "
|
||||
mke2fs -q -I 128 _disk_image || die "couldn't create filesystem"
|
||||
echo "done"
|
||||
|
||||
echo -n "mounting filesystem... "
|
||||
printf "mounting filesystem... "
|
||||
mkdir -p mnt
|
||||
mount _disk_image mnt/ || die "couldn't mount filesystem"
|
||||
echo "done"
|
||||
|
||||
cleanup() {
|
||||
if [ -d mnt ]; then
|
||||
echo -n "unmounting filesystem... "
|
||||
printf "unmounting filesystem... "
|
||||
umount mnt || ( sleep 1 && sync && umount mnt )
|
||||
rm -rf mnt
|
||||
echo "done"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
|
|
@ -6,20 +6,22 @@ set -e
|
|||
rm -f ../Userland/qs
|
||||
|
||||
die() {
|
||||
echo "die: $@"
|
||||
echo "die: $*"
|
||||
exit 1
|
||||
}
|
||||
|
||||
if [ $(id -u) != 0 ]; then
|
||||
if [ "$(id -u)" != 0 ]; then
|
||||
die "this script needs to run as root"
|
||||
fi
|
||||
|
||||
echo -n "creating initial filesystem structure... "
|
||||
mkdir -p mnt/{bin,etc,proc,mnt,tmp}
|
||||
printf "creating initial filesystem structure... "
|
||||
for dir in bin etc proc mnt tmp; do
|
||||
mkdir -p mnt/$dir
|
||||
done
|
||||
chmod 1777 mnt/tmp
|
||||
echo "done"
|
||||
|
||||
echo -n "setting up device nodes... "
|
||||
printf "setting up device nodes... "
|
||||
mkdir -p mnt/dev
|
||||
mkdir -p mnt/dev/pts
|
||||
mknod -m 666 mnt/dev/fb0 b 29 0
|
||||
|
|
@ -49,13 +51,13 @@ ln -s /proc/self/fd/1 mnt/dev/stdout
|
|||
ln -s /proc/self/fd/2 mnt/dev/stderr
|
||||
echo "done"
|
||||
|
||||
echo -n "installing base system... "
|
||||
printf "installing base system... "
|
||||
cp -R ../Base/* mnt/
|
||||
cp -R ../Root/* mnt/
|
||||
cp kernel.map mnt/
|
||||
echo "done"
|
||||
|
||||
echo -n "installing users... "
|
||||
printf "installing users... "
|
||||
mkdir -p mnt/home/anon
|
||||
mkdir -p mnt/home/nona
|
||||
cp ../ReadMe.md mnt/home/anon/
|
||||
|
|
@ -63,12 +65,12 @@ chown -R 100:100 mnt/home/anon
|
|||
chown -R 200:200 mnt/home/nona
|
||||
echo "done"
|
||||
|
||||
echo -n "installing userland... "
|
||||
printf "installing userland... "
|
||||
find ../Userland/ -type f -executable -exec cp {} mnt/bin/ \;
|
||||
chmod 4755 mnt/bin/su
|
||||
echo "done"
|
||||
|
||||
echo -n "installing applications... "
|
||||
printf "installing applications... "
|
||||
cp ../Applications/About/About mnt/bin/About
|
||||
cp ../Applications/Downloader/Downloader mnt/bin/Downloader
|
||||
cp ../Applications/FileManager/FileManager mnt/bin/FileManager
|
||||
|
|
@ -110,7 +112,7 @@ cp ../Servers/TelnetServer/TelnetServer mnt/bin/TelnetServer
|
|||
cp ../Shell/Shell mnt/bin/Shell
|
||||
echo "done"
|
||||
|
||||
echo -n "installing shortcuts... "
|
||||
printf "installing shortcuts... "
|
||||
ln -s Downloader mnt/bin/dl
|
||||
ln -s FileManager mnt/bin/fm
|
||||
ln -s HelloWorld mnt/bin/hw
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
mkdir -p ../Root/usr/include/Kernel/
|
||||
cp *.h ../Root/usr/include/Kernel/
|
||||
cp ./*.h ../Root/usr/include/Kernel/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
# Get user and group details for setting qemu disk image ownership
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
./build-image-qemu.sh
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue