tidy up scripts

Author: nift4

add_os/mimameid/add_ubuntutouch_systemimage_haliumboot.sh

@@ -1,37 +1,30 @@
 #!/system/bin/sh
 
-TK="/data/data/org.andbootmgr.app/assets/Toolkit"
-PATH="$TK:$PATH"
-cd "$TK" || exit 24
-
-sed -i "s#replaceme#systempart=/dev/mmcblk1p$4 datapart=/dev/mmcblk1p$5#g" /data/abm/bootset/db/entries/"$1".conf
+sed -i "s#replaceme#systempart=/dev/mmcblk1p$4 datapart=/dev/mmcblk1p$5#g" "$BOOTSET/db/entries/$1.conf"
 
 # Add logo
-echo "logo $1/logo.bin" >> /data/abm/bootset/db/entries/"$1".conf
-cp "$3" "/data/abm/bootset/$1/logo.bin"
+echo "logo $1/logo.bin" >> "$BOOTSET/db/entries/$1.conf"
+cp "$3" "$BOOTSET/$1/logo.bin"
 
 # Create working dir
-mkdir -p /data/abm/tmp/boot
+TEMP="$(mktemp -d install)"
+mkdir -p "$TEMP/boot"
 
 # Copy boot
-cp "$2" /data/abm/tmp/boot/boot.img
+cp "$2" "$TEMP/boot/boot.img"
 
 # Unpack boot
-unpackbootimg -i /data/abm/tmp/boot/boot.img -o /data/abm/tmp/boot/
+unpackbootimg -i "$TEMP/boot/boot.img" -o "$TEMP/boot/"
 
 # Format partition
 DATAPART=$5
 dataformat() {
 true | mkfs.ext4 "/dev/block/mmcblk1p$DATAPART"
 }
-
 $FORMATDATA && dataformat
 
 # Copy kernel
-cp /data/abm/tmp/boot/boot.img-zImage "/data/abm/bootset/$1/zImage"
+cp "$TEMP/boot/boot.img-zImage" "$BOOTSET/$1/zImage"
 
 # Copy rd
-cp /data/abm/tmp/boot/boot.img-ramdisk.gz "/data/abm/bootset/$1/initrd.cpio.gz" 
-
-# Clean up
-rm -rf /data/abm/tmp
+cp "$TEMP/boot/boot.img-ramdisk.gz" "$BOOTSET/$1/initrd.cpio.gz"

add_os/vayu/add_ubuntutouch_systemimage_haliumboot.sh

@@ -1,57 +1,51 @@
 #!/system/bin/sh
 
-TK="/data/data/org.andbootmgr.app/assets/Toolkit"
-PATH="$TK:$PATH"
-cd "$TK" || exit 24
-
-sed -i "s#replaceme#systempart=/dev/mmcblk0p$4 datapart=/dev/mmcblk0p$5#g" /data/abm/bootset/db/entries/"$1".conf
+sed -i "s#replaceme#systempart=/dev/mmcblk0p$4 datapart=/dev/mmcblk0p$5#g" "$BOOTSET/db/entries/$1.conf"
 
 # Copy ut vendor
-e2fsck -f /dev/block/mmcblk0p$4
-resize2fs /dev/block/mmcblk0p$4
-mkdir -p /data/abm/tmp/mnt
-mount /dev/block/mmcblk0p$4 /data/abm/tmp/mnt
-cp "$3" /data/abm/tmp/mnt/var/lib/lxc/android/vendor.img
-umount /data/abm/tmp/mnt
+e2fsck -f "/dev/block/mmcblk0p$4"
+resize2fs "/dev/block/mmcblk0p$4"
+TEMP="$(mktemp -d install)"
+mkdir -p "$TEMP/mnt"
+mount "/dev/block/mmcblk0p$4" "$TEMP/mnt"
+cp "$3" "$TEMP/mnt/var/lib/lxc/android/vendor.img"
+umount "$TEMP/mnt"
 
 # Create working dir
-mkdir -p /data/abm/tmp/boot
+mkdir -p "$TEMP/boot"
 
 # Copy boot
-cp "$2" /data/abm/tmp/boot/boot.img
+cp "$2" "$TEMP/boot/boot.img"
 
 # Unpack boot
-unpackbootimg -i /data/abm/tmp/boot/boot.img -o /data/abm/tmp/boot/
+unpackbootimg -i "$TEMP/boot/boot.img" -o "$TEMP/boot/"
 
 # Go to dt dir, extract dtb and go back
-mkdir -p /data/abm/tmp/dt
-# shellcheck disable=SC2164
-cd /data/abm/tmp/dt/
-split-appended-dtb ../boot/boot.img-dtb
-# shellcheck disable=SC2164
-cd "$TK"
-
-# prepear dtbo
-mkdir -p /data/abm/tmp/dtbo
-# shellcheck disable=SC2164
-cd /data/abm/tmp/dtbo/
+mkdir -p "$TEMP/dt"
+cd "$TEMP/dt/" || exit 1
+split-appended-dtb "$TEMP/boot/boot.img-dtb"
+cd "$TK" || exit 1
+
+# prepare dtbo
+mkdir -p "$TEMP/dtbo"
+cd "$TEMP/dtbo/" || exit 1
 split-appended-dtb /dev/block/bootdevice/by-name/dtbo
-# shellcheck disable=SC2164
-cd "$TK"
+cd "$TK" || exit 1
 
 # Copy device tree and device tree overlay
-dtc -I dtb -O dts -o /data/abm/tmp/dt/current.dts /sys/firmware/fdt
-msmidc=$(grep msm-id < /data/abm/tmp/dt/current.dts)
+dtc -I dtb -O dts -o "$TEMP/dt/current.dts" /sys/firmware/fdt
+msmidc=$(grep msm-id < "$TEMP/dt/current.dts")
 msmidc=$(echo "$msmidc" | awk '{print $4}')
-# shellcheck disable=SC3057
+# shellcheck disable=SC2039
 msmidc=${msmidc:0:7}
 echo "msm-id is $msmidc"
 
 # Fetch abm-board-id from the command line
-abm_board_id_arg=$(cat /proc/cmdline | grep -oE 'abm-board-id=[^ ]+' | cut -d= -f2)
+abm_board_id_arg=$(grep -oE 'abm-board-id=[^ ]+' /proc/cmdline | cut -d= -f2)
 
 # If abm-board-id argument is found, store it in bidc variable
 if [ -n "$abm_board_id_arg" ]; then
+	# shellcheck disable=SC3057
     bidc=${abm_board_id_arg:0:2}
     echo "board-id is $bidc"
 else
@@ -60,18 +54,18 @@ else
 fi
 
 
-for f in /data/abm/tmp/dt/dtbdump_*.dtb
+for f in "$TEMP"/dt/dtbdump_*.dtb
 do
- dtc -I dtb -O dts -o /data/abm/tmp/dt/test.dts "$f"
- msmidt=$(grep msm-id < /data/abm/tmp/dt/test.dts)
+ dtc -I dtb -O dts -o "$TEMP/dt/test.dts" "$f"
+ msmidt=$(grep msm-id < "$TEMP/dt/test.dts")
  msmidt=$(echo "$msmidt" | awk '{print $4}')
  # shellcheck disable=SC3057
  msmidt=${msmidt:0:7}
  echo "msmidt $msmidt"
  if [ "$msmidt" = "$msmidc" ]; then
   echo "Found correct dtb $f"
-  sed -i '/vendor {/,/};/s/\(\s*status =\).*/\1 "disabled";/'  /data/abm/tmp/dt/test.dts
-  dtc -I dts -O dtb -o "/data/abm/bootset/$1/dtb.dtb" /data/abm/tmp/dt/test.dts
+  sed -i '/vendor {/,/};/s/\(\s*status =\).*/\1 "disabled";/' "$TEMP/dt/test.dts"
+  dtc -I dts -O dtb -o "$BOOTSET/$1/dtb.dtb" "$TEMP/dt/test.dts"
  fi
 done
 if [ ! -f "$f" ]
@@ -80,10 +74,10 @@ then
   exit 1
 fi
 
-for f in /data/abm/tmp/dtbo/dtbdump_*.dtb
+for f in "$TEMP"/dtbo/dtbdump_*.dtb
 do
- dtc -I dtb -O dts -o /data/abm/tmp/dtbo/test.dts "$f"
- bidt=$(grep board-id < /data/abm/tmp/dtbo/test.dts)
+ dtc -I dtb -O dts -o "$TEMP/dtbo/test.dts" "$f"
+ bidt=$(grep board-id < "$TEMP/dtbo/test.dts")
  echo "bidt1 $bidt"
  bidt=$(echo "$bidt" | awk '{print $3}')
  echo "bidt2 $bidt"
@@ -92,7 +86,7 @@ do
  echo "bidt $bidt"
  if [ "$bidc" == "$bidt" ]; then
   echo "Found correct dtbo $f"
-  cp "$f" "/data/abm/bootset/$1/dtbo.dtbo"
+  cp "$f" "$BOOTSET/$1/dtbo.dtbo"
  fi
 done
 if [ ! -f "$f" ]
@@ -102,10 +96,7 @@ then
 fi
 
 # Copy kernel
-cp /data/abm/tmp/boot/boot.img-zImage "/data/abm/bootset/$1/zImage"
+cp "$TEMP/boot/boot.img-zImage" "$BOOTSET/$1/zImage"
 
 # Copy rd
-cp /data/abm/tmp/boot/boot.img-ramdisk.gz "/data/abm/bootset/$1/initrd.cpio.gz" 
-
-# Clean up
-rm -rf /data/abm/tmp
+cp "$TEMP/boot/boot.img-ramdisk.gz" "$BOOTSET/$1/initrd.cpio.gz"

add_os/vidofnir/add_ubuntutouch_systemimage_haliumboot.sh

@@ -1,37 +1,30 @@
 #!/system/bin/sh
 
-TK="/data/data/org.andbootmgr.app/assets/Toolkit"
-PATH="$TK:$PATH"
-cd "$TK" || exit 24
-
-sed -i "s#replaceme#systempart=/dev/mmcblk1p$4 datapart=/dev/mmcblk1p$5#g" /data/abm/bootset/db/entries/"$1".conf
+sed -i "s#replaceme#systempart=/dev/mmcblk1p$4 datapart=/dev/mmcblk1p$5#g" "$BOOTSET/db/entries/$1.conf"
 
 # Add logo
-echo "logo $1/logo.bin" >> /data/abm/bootset/db/entries/"$1".conf
-cp "$3" "/data/abm/bootset/$1/logo.bin"
+echo "logo $1/logo.bin" >> "$BOOTSET/db/entries/$1.conf"
+cp "$3" "$BOOTSET/$1/logo.bin"
 
 # Create working dir
-mkdir -p /data/abm/tmp/boot
+TEMP="$(mktemp -d install)"
+mkdir -p "$TEMP/boot"
 
 # Copy boot
-cp "$2" /data/abm/tmp/boot/boot.img
+cp "$2" "$TEMP/boot/boot.img"
 
 # Unpack boot
-unpackbootimg -i /data/abm/tmp/boot/boot.img -o /data/abm/tmp/boot/
+unpackbootimg -i "$TEMP/boot/boot.img" -o "$TEMP/boot/"
 
 # Format partition
 DATAPART=$5
 dataformat() {
 true | mkfs.ext4 "/dev/block/mmcblk1p$DATAPART"
 }
-
 $FORMATDATA && dataformat
 
 # Copy kernel
-cp /data/abm/tmp/boot/boot.img-zImage "/data/abm/bootset/$1/zImage"
+cp "$TEMP/boot/boot.img-zImage" "$BOOTSET/$1/zImage"
 
 # Copy rd
-cp /data/abm/tmp/boot/boot.img-ramdisk.gz "/data/abm/bootset/$1/initrd.cpio.gz" 
-
-# Clean up
-rm -rf /data/abm/tmp
+cp "$TEMP/boot/boot.img-ramdisk.gz" "$BOOTSET/$1/initrd.cpio.gz"

add_os/yggdrasil/add_sailfish.sh

@@ -1,32 +1,25 @@
 #!/system/bin/sh
 
-# Script for installing SailfishOS for ABM. Parameters: ROM folder name, boot path, vendor partition number, system partition number, sfos partition number.
-
-TK="/data/data/org.andbootmgr.app/assets/Toolkit"
-PATH="$TK:$PATH"
-cd "$TK" || exit 24
-
 # Create working dir
-mkdir -p /data/abm/tmp/sfos/rd
-mkdir -p /data/abm/tmp/boot
-mkdir -p /data/abm/mnt
+TEMP="$(mktemp -d install)"
+mkdir -p "$TEMP/sfos/rd"
+mkdir -p "$TEMP/boot"
+mkdir -p "$TEMP/mnt"
 
 # Copy boot
-cp "$2" /data/abm/tmp/boot/boot.img
+cp "$2" "$TEMP/boot/boot.img"
 
 # Unpack boot
-unpackbootimg -i /data/abm/tmp/boot/boot.img -o /data/abm/tmp/boot/
+unpackbootimg -i "$TEMP/boot/boot.img" -o "$TEMP/boot/"
 
 # Go to dt dir, extract dtb and go back
-# shellcheck disable=SC2164
-cd /data/abm/tmp/boot/
+cd "$TEMP/boot/" || exit 1
 split-appended-dtb boot.img-zImage
-# shellcheck disable=SC2164
-cd "$TK"
+cd "$TK" || exit 1
 
 # Patch ramdisk
-(cd /data/abm/tmp/sfos/rd && gunzip -c /data/abm/tmp/boot/boot.img-ramdisk.gz | cpio -i )
-#cat >/data/abm/tmp/sfos/rd/system_root.mount <<EOF
+(cd "$TEMP/sfos/rd" && gunzip -c "$TEMP/boot/boot.img-ramdisk.gz" | cpio -i )
+#cat >"$TEMP/sfos/rd/system_root.mount" <<EOF
 #[Unit]
 #Description=Droid mount for /system_root
 #Before=local-fs.target systemd-modules-load.service
@@ -48,7 +41,7 @@ cd "$TK"
 ## From ./out/target/product/GS290/vendor/etc/fstab.mt6763 :
 ## /dev/mmcblk0p31       /           ext4        ro                                                    wait,avb=boot,first_stage_mount
 #EOF
-#cat >/data/abm/tmp/sfos/rd/vendor.mount <<EOF
+#cat >"$TEMP/sfos/rd/vendor.mount" <<EOF
 #[Unit]
 #Description=Droid mount for /vendor
 #Before=local-fs.target systemd-modules-load.service
@@ -72,15 +65,12 @@ cd "$TK"
 #EOF
 # on purpose:
 # shellcheck disable=SC2016
-sed -i 's/PHYSDEV=$(find-mmc-bypartlabel "\$label")/sleep 10; PHYSDEV=\/dev\/mmcblk1p'"$5/g" /data/abm/tmp/sfos/rd/sbin/root-mount
-#sed -i 's/log "Root partition is mounted."/mount --bind \/system_root.mount \/rootfs\/usr\/lib\/systemd\/system\/system_root.mount; mount --bind \/vendor.mount \/rootfs\/usr\/lib\/systemd\/system\/vendor.mount; log "-ABM- Root partition is mounted."/g' /data/abm/tmp/sfos/rd/sbin/root-mount
-(cd /data/abm/tmp/sfos/rd && find . | cpio -o -H newc | gzip > "/data/abm/bootset/$1/initrd.cpio.gz")
+sed -i 's/PHYSDEV=$(find-mmc-bypartlabel "\$label")/sleep 10; PHYSDEV=\/dev\/mmcblk1p'"$5/g" "$TEMP/sfos/rd/sbin/root-mount"
+#sed -i 's/log "Root partition is mounted."/mount --bind \/system_root.mount \/rootfs\/usr\/lib\/systemd\/system\/system_root.mount; mount --bind \/vendor.mount \/rootfs\/usr\/lib\/systemd\/system\/vendor.mount; log "-ABM- Root partition is mounted."/g' "$TEMP/sfos/rd/sbin/root-mount"
+(cd "$TEMP/sfos/rd" && find . | cpio -o -H newc | gzip > "$BOOTSET/$1/initrd.cpio.gz")
 
 # Copy dtb
-cp /data/abm/tmp/boot/dtbdump_1.dtb "/data/abm/bootset/$1/dtb.dtb"
+cp "$TEMP/boot/dtbdump_1.dtb" "$BOOTSET/$1/dtb.dtb"
 
 # Copy kernel
-cp /data/abm/tmp/boot/kernel "/data/abm/bootset/$1/zImage"
-
-# Clean up
-rm -rf /data/abm/tmp
+cp "$TEMP/boot/kernel" "$BOOTSET/$1/zImage"

add_os/yggdrasilx/add_ubuntutouch_systemimage_haliumboot.sh

@@ -1,37 +1,30 @@
 #!/system/bin/sh
 
-TK="/data/data/org.andbootmgr.app/assets/Toolkit"
-PATH="$TK:$PATH"
-cd "$TK" || exit 24
-
-sed -i "s#replaceme#systempart=/dev/mmcblk1p$4 datapart=/dev/mmcblk1p$5#g" /data/abm/bootset/db/entries/"$1".conf
+sed -i "s#replaceme#systempart=/dev/mmcblk1p$4 datapart=/dev/mmcblk1p$5#g" "$BOOTSET/db/entries/$1.conf"
 
 # Add logo
-echo "logo $1/logo.bin" >> /data/abm/bootset/db/entries/"$1".conf
-cp "$3" "/data/abm/bootset/$1/logo.bin"
+echo "logo $1/logo.bin" >> "$BOOTSET/db/entries/$1.conf"
+cp "$3" "$BOOTSET/$1/logo.bin"
 
 # Create working dir
-mkdir -p /data/abm/tmp/boot
+TEMP="$(mktemp -d install)"
+mkdir -p "$TEMP/boot"
 
 # Copy boot
-cp "$2" /data/abm/tmp/boot/boot.img
+cp "$2" "$TEMP/boot/boot.img"
 
 # Unpack boot
-unpackbootimg -i /data/abm/tmp/boot/boot.img -o /data/abm/tmp/boot/
+unpackbootimg -i "$TEMP/boot/boot.img" -o "$TEMP/boot/"
 
 # Format partition
 DATAPART=$5
 dataformat() {
 true | mkfs.ext4 "/dev/block/mmcblk1p$DATAPART"
 }
-
 $FORMATDATA && dataformat
 
 # Copy kernel
-cp /data/abm/tmp/boot/boot.img-zImage "/data/abm/bootset/$1/zImage"
+cp "$TEMP/boot/boot.img-zImage" "$BOOTSET/$1/zImage"
 
 # Copy rd
-cp /data/abm/tmp/boot/boot.img-ramdisk.gz "/data/abm/bootset/$1/initrd.cpio.gz" 
-
-# Clean up
-rm -rf /data/abm/tmp
+cp "$TEMP/boot/boot.img-ramdisk.gz" "$BOOTSET/$1/initrd.cpio.gz"