From cbb3f9f2295f7f86de5e92f14c93ddea119c5e58 Mon Sep 17 00:00:00 2001 From: SysAdmin Date: Wed, 6 Sep 2023 20:18:35 +0300 Subject: [PATCH] fix --- install.sh | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/install.sh b/install.sh index 1e977e1..23bbfb9 100755 --- a/install.sh +++ b/install.sh @@ -3,7 +3,7 @@ set -e WORKDIR=/home/.aliendalvik_systemimg_patch TMPWORKDIR="$WORKDIR/tmp" SQUASHFS_ROOT="$TMPWORKDIR/squashfs-root" -SYSTEM_IMG=/opt/alien/system1.img +SYSTEM_IMG=/opt/alien/system.img log() { printf '%s\n' "$1" > /dev/stderr @@ -11,43 +11,26 @@ log() { extract_image() { - if [ ! -f "$orig_image" ]; then - log "$orig_image not found" + if [ ! -f "$SYSTEM_IMG" ]; then + log "$SYSTEM_IMG not found" return 1 fi -unsquashfs -dest "$SQUASHFS_ROOT/" "$SYSTEM_IMG" - + unsquashfs -dest "$SQUASHFS_ROOT/" "$SYSTEM_IMG" } install_patch() { -cp nexus.xml "$SQUASHFS_ROOT/system/etc/sysconfig/nexus.xml" -cat system.prop >> "$SQUASHFS_ROOT/system/system_ext/build.prop" + cp nexus.xml "$SQUASHFS_ROOT/system/etc/sysconfig/nexus.xml" + cat system.prop >> "$SQUASHFS_ROOT/system/system_ext/build.prop" } build_image() { cp "$SYSTEM_IMG" "$TMPWORKDIR/system.img.backup" mksquashfs "$SQUASHFS_ROOT" "$SYSTEM_IMG" -noappend -no-exports -no-duplicates -no-fragments rm "$TMPWORKDIR/system.img.backup" -# rm -r "$SQUASHFS_ROOT" + rm -r "$SQUASHFS_ROOT" } -set_traps() { - # shellcheck disable=SC2064 - trap "$*" EXIT HUP INT QUIT PIPE TERM -} - -cleanup() { - if [ ! -f "$SYSTEM_IMG" ] && [ -f "$TMPWORKDIR/system.img.backup" ]; then - mv "$TMPWORKDIR/system.img.backup" "$SYSTEM_IMG" || : - fi - umount "$MOUNT_ROOT" || : - rm -r "$TMPWORKDIR" || : - set_traps - - exit 1 -} - -set_traps cleanup -#systemctl stop aliendalvik +systemctl stop aliendalvik mkdir -p "$WORKDIR" mkdir -p "$TMPWORKDIR" @@ -60,7 +43,7 @@ log "build image" build_image log "image was built" -#rmdir "$TMPWORKDIR" +rmdir "$TMPWORKDIR" set_traps - exit 0 \ No newline at end of file