Print trampoline and MultiROM version to Log; improve reference ZIP

Author: Tasssadar

main.c

@@ -57,6 +57,8 @@ int main(int argc, char *argv[])
     srand(time(0));
     klog_init();
 
+    ERROR("Running MultiROM v%d\n", VERSION_MULTIROM);
+
     int exit = multirom();
 
     if(exit >= 0)

ref_install_zip/META-INF/com/google/android/updater-script

@@ -10,14 +10,29 @@ run_program("/sbin/busybox", "mount", "/data");
 package_extract_dir("scripts", "/tmp/");
 
 set_perm(0, 0, 0777, "/tmp/extract.sh");
+set_perm(0, 0, 0777, "/tmp/check.sh");
 set_perm(0, 0, 0777, "/tmp/gnutar");
 
+ui_print("Checking MultiROM version...");
+ifelse(run_program("/tmp/check.sh") != 0,
+(
+    ui_print("** Your MultiROM version too low for this ZIP file");
+    ui_print("** or unable to find MultiROM binary.");
+    abort();
+),"");
+
 ui_print("Exracting archive to tmp...");
 package_extract_dir("rom", "/tmp/rom/");
 
 ui_print("Extracting archive to ROM folder (will take a while)...");
-assert(run_program("/tmp/extract.sh") == 0);
+ifelse(run_program("/tmp/extract.sh") != 0,
+(
+    ui_print("** Failed to exract archive. Probably not enough space in /data");
+    abort();
+),"");
 
 delete("/tmp/extract.sh");
+delete("/tmp/check.sh");
+delete("/tmp/gnutar");
 delete_recursive("/tmp/rom");
 ui_print("Installation complete!");

ref_install_zip/scripts/check.sh

@@ -0,0 +1,28 @@
+#!/sbin/sh
+MIN_VER="5"
+
+path=""
+if [ -e "/data/media/multirom/multirom" ] ; then
+    path="/data/media/multirom/multirom"
+elif [ -e "/data/media/0/multirom/multirom" ] ; then
+    path="/data/media/0/multirom/multirom"
+else
+    echo "Failed to find multirom binary!" 1>&2
+    exit 1
+fi
+echo "Checking MultiROM version..."
+
+res=$($path -v)
+if [ "$?" -ne "0" ] ; then 
+    echo "Failed to execute MultiROM binary!" 1>&2
+    exit 1
+fi
+
+echo "Got version $res"
+
+if [ "$res" -lt "$MIN_VER" ] ; then
+    echo "Your MultiROM version ($res) is too low, version $MIN_VER is required!" 1>&2
+    exit 1
+fi
+
+exit 0

ref_install_zip/scripts/extract.sh

@@ -1,5 +1,5 @@
 #!/sbin/sh
-ROM_NAME="plasma"
+ROM_NAME="reference"
 
 path=""
 if [ -d "/data/media/multirom/roms" ] ; then

trampoline/trampoline.c

@@ -204,7 +204,9 @@ int main(int argc, char *argv[])
 
     klog_init();
 
-    ERROR("Initializing devices");
+    ERROR("Running trampoline v%d\n", VERSION_TRAMPOLINE);
+
+    ERROR("Initializing devices...");
     devices_init();
     ERROR("Done initializing");