update for pie

Micha-Btz · Aug 21, 2019 · 82ce62a · 82ce62a
1 parent a639a6d
commit 82ce62a
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 59 deletions.
diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary
diff --git a/META-INF/com/google/android/updater-script b/META-INF/com/google/android/updater-script
@@ -1,4 +1,4 @@
-ui_print("Installing swipelib addon...");
+ui_print("Installing swipelib pie addon...");
 ifelse(is_mounted("/system"), unmount("/system"));
 package_extract_file("mount-system.sh", "/tmp/mount-system.sh");
 package_extract_file("unmount-system.sh", "/tmp/unmount-system.sh");
@@ -9,11 +9,12 @@ run_program("/tmp/mount-system.sh") == 0 || abort("Could not mount /system");
 if getprop("ro.build.system_root_image") != "true" then
   package_extract_dir("system", "/system");
   set_metadata("/system/addon.d/78-swipelib.sh", "uid", 0, "gid", 0, "mode", 0755, "selabel", "u:object_r:system_file:s0");
-  set_metadata("/system/app/LatinIME/lib/arm64/libjni_latinimegoogle.so", "uid", 0, "gid", 0, "mode", 0644, "selabel", "u:object_r:system_file:s0");
+  set_metadata("/system/lib64/libjni_latinimegoogle.so", "uid", 0, "gid", 0, "mode", 0755, "selabel", "u:object_r:system_file:s0");
+
 else
-  package_extract_dir("system", "/system/system");
-  set_metadata("/system/system/addon.d/78-swipelib.sh", "uid", 0, "gid", 0, "mode", 0755, "selabel", "u:object_r:system_file:s0");
-  set_metadata("/system/system/app/LatinIME/lib/arm64/libjni_latinimegoogle.so", "uid", 0, "gid", 0, "mode", 0644, "selabel", "u:object_r:system_file:s0");
+  package_extract_dir("system", "/system_root/system");
+  set_metadata("/system_root/system/addon.d/78-swipelib.sh", "uid", 0, "gid", 0, "mode", 0755, "selabel", "u:object_r:system_file:s0");
+  set_metadata("/system_root/system/lib64/libjni_latinimegoogle.so", "uid", 0, "gid", 0, "mode", 0755, "selabel", "u:object_r:system_file:s0");
 endif;
 
 run_program("/tmp/unmount-system.sh") == 0 || ui_print("Could not unmount /system");

diff --git a/mount-system.sh b/mount-system.sh
@@ -1,27 +1,34 @@
 #!/sbin/sh
 
-if mount /system; then
+# Modern devices use /system as root ("/")
+system_as_root=`getprop ro.build.system_root_image`
+if [ "$system_as_root" == "true" ]; then
+  if mount /system_root; then
     exit 0
-fi
+  fi
 
-# Try to get the block from /etc/recovery.fstab
-block=`cat /etc/recovery.fstab | cut -d '#' -f 1 | grep /system | grep -o '/dev/[^ ]*' | head -1`
-if [ -n "$block" ] && mount $block /; then
+  active_slot=`getprop ro.boot.slot_suffix`
+  if [ ! -z "$active_slot" ]; then
+    block=/dev/block/bootdevice/by-name/system$active_slot
+  else
+    block=/dev/block/bootdevice/by-name/system
+  fi
+  mkdir -p /system_root
+  if mount -o rw $block /system_root ||
+     mount -o rw $block /system_root -t ext4 ||
+     mount -o rw $block /system_root -t f2fs; then
     exit 0
-fi
+  fi
+else
+  if mount /system; then
+    exit 0
+  fi
 
-# Modern devices use /system as root ("/")
-#system_as_root=`getprop ro.build.system_root_image`
-#if [ "$system_as_root" == "true" ]; then
-#  active_slot=`getprop ro.boot.slot_suffix`
-#  if [ ! -z "$active_slot" ]; then
-#    block=/dev/block/bootdevice/by-name/system$active_slot
-#  else
-#    block=/dev/block/bootdevice/by-name/system
-#  fi
-#  if mount -o rw $block /system_root && mount /system_root /system; then
-#    exit 0
- # fi
-#fi
+  # Try to get the block from /etc/recovery.fstab
+  block=`cat /etc/recovery.fstab | cut -d '#' -f 1 | grep /system | grep -o '/dev/[^ ]*' | head -1`
+  if [ -n "$block" ] && mount $block /system; then
+    exit 0
+  fi
+fi
 
 exit 1
diff --git a/signapk.jar b/signapk.jar
diff --git a/system/addon.d/78-swipelib.sh b/system/addon.d/78-swipelib.sh
@@ -4,7 +4,7 @@
 
 list_files() {
 cat <<EOF
-/system/app/LatinIME/lib/arm64/libjni_latinimegoogle.so
+/system/lib64/libjni_latinimegoogle.so
 /system/addon.d/78-swipelib.sh
 EOF
 }

diff --git a/...tinIME/lib/arm64/libjni_latinimegoogle.so → system/lib64/libjni_latinimegoogle.so b/...tinIME/lib/arm64/libjni_latinimegoogle.so → system/lib64/libjni_latinimegoogle.so
diff --git a/testkey.pk8 b/testkey.pk8
diff --git a/testkey.x509.pem b/testkey.x509.pem
diff --git a/unmount-system.sh b/unmount-system.sh
@@ -3,13 +3,13 @@
 # Modern devices use /system as root ("/")
 system_as_root=`getprop ro.build.system_root_image`
 if [ "$system_as_root" == "true" ]; then
-  if umount /system && umount /system_root; then
+  if umount /system_root; then
     exit 0
   fi
-fi
-
-if umount /system; then
+else
+  if umount /system; then
     exit 0
+  fi
 fi
 
 exit 1
diff --git a/zip.sh b/zip.sh
@@ -1,15 +1,15 @@
 #! /bin/bash
 FILE=swipelib
-VERSION=v0.5.2
-CM_Version=lineage-15.1
+VERSION=v0.6.2
+CM_Version=lineage-16.0
 NAME=($FILE-$CM_Version-$VERSION)
 
 echo "Making Zip"
 # zipping
 zip -r $NAME.zip system/* META-INF/* mount-system.sh unmount-system.sh
 echo "ZIP is Ready"
 echo "Signing ZIP"
-java -jar signapk.jar testkey.x509.pem testkey.pk8 $NAME.zip $NAME-SIGNED.zip
+java -jar /usr/share/signapk/signapk.jar --min-sdk-version 25 buildtools/testkey.x509.pem buildtools/testkey.pk8 $NAME.zip $NAME-SIGNED.zip
 # Cleanup
 echo "Cleaning up"
 rm $NAME.zip