fix

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,12 +11,11 @@ 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"
-
 }
 
 install_patch() {
@@ -28,26 +27,10 @@ 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