Installer fixes

Author: ezdiy

jailbreak-installer.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 PKGVER=v4
+iv2sh SetActiveTask `pidof bookshelf.app` 0
 if [ -e /mnt/secure/su ]; then
 	dialog 2 "" "Do you wish to remove root?" "Yes" "No"
 	if [ $? != 1 ]; then

services-installer.sh

@@ -6,9 +6,10 @@ PVER=`cat /mnt/secure/.pkgver`
 
 if [ "$PVER" != "" ] && [ "$PVER" != "$PKGVER" ]; then
 	dialog 1 "" "Version $PVER already installed" "Update to $PKGVER" "Cancel" "Uninstall"
-	if [ $? == 3 ]; then
+	st=$?
+	if [ $st == 3 ]; then
 		chattr -i /mnt/secure/runonce/*.sh
-		rm -rf /mnt/secure/runonce/*.sh /mnt/secure/bin /mnt/secure/etc
+		rm -rf /mnt/secure/runonce/*.sh /mnt/secure/bin /mnt/secure/etc /mnt/secure/.pkgver
 		settings=/mnt/ext1/system/config/settings/settings.json
 		rm -f $settings
 		mv -f $settings.old $settings
@@ -18,12 +19,14 @@ if [ "$PVER" != "" ] && [ "$PVER" != "$PKGVER" ]; then
 		        reboot
 		fi
 		exit 0
+	elif [ $st == 2 ]; then
+		exit 0
 	fi
 else
 	dialog 1 "" "Do you wish to install $PKGVER?" "Yes" "No"
-fi
-if [ $? != 1 ]; then
-	exit 0
+	if [ $? != 1 ]; then
+		exit 0
+	fi
 fi
 echo $PKGVER > /mnt/secure/.pkgver
 mkdir -p /mnt/ext1/public_html
@@ -97,7 +100,7 @@ cat <<_EOF > $rootset
                 "storage"       :   ["/mnt/ext1/rootpassword.txt, password"],
         }
 _EOF
-for n in /mnt/secure/init.d/*.sh; do
+for n in /mnt/secure/etc/init.d/*.sh; do
         desc="$(head -2 $n | tail -1)"
         if [ "${desc:0:2}" != "##" ]; then
                 continue

su.c

@@ -33,8 +33,6 @@ int main(int argc, char **argv) {
 			int fd = open("/proc/self/mem", O_RDWR);
 			char buf[4] = "/lib";
 			for (int i = 0; !memcmp(buf, "/lib", 4); i++) {
-				//lseek(fd, (off_t)(unsigned int)pp, SEEK_SET);
-				//write(fd, us, strlen(us) + 1);
 				pwrite(fd, us, strlen(us) + 1, (off_t)(unsigned)pp);
 				if (!(i&0xff))
 					pread(sudo, buf, 4, pp-map);