script support for last commit

git-svn-id: http://firmware-mod-kit.googlecode.com/svn/trunk@445 5c1471b0-2a1b-0410-b4f4-f33460ac40b9

ddwrt-gui-extract.sh

@@ -13,9 +13,15 @@ then
 	OUT="www"
 fi
 
+if [ $UID -ne 0 ]
+then
+	SUDO="sudo"
+fi
+
 eval $(cat shared-ng.inc)
 HTTPD="$DIR/usr/sbin/httpd"
 WWW="$DIR/etc/www"
+KEYFILE="$DIR/webcomp.key"
 
 echo -e "Firmware Mod Kit (ddwrt-gui-extract) $VERSION, (c)2013 Craig Heffner, Jeremy Collake\nhttp://www.bitsum.com\n"
 
@@ -32,5 +38,8 @@ then
 fi
 
 # Extract!
-./src/webcomp-tools/webdecomp --httpd="$HTTPD" --www="$WWW" --dir="$OUT" --extract
+# key file is written to rootfs, and since may have root ownership, sudo
+TMPFILE=`mktemp /tmp/$0.XXXXXX`
+./src/webcomp-tools/webdecomp --httpd="$HTTPD" --www="$WWW" --dir="$OUT" --key="$TMPFILE" --extract
+$SUDO cp "$TMPFILE" "$KEYFILE"
 

ddwrt-gui-rebuild.sh

@@ -22,6 +22,7 @@ fi
 eval $(cat shared-ng.inc)
 HTTPD="$DIR/usr/sbin/httpd"
 WWW="$DIR/etc/www"
+KEYFILE="$DIR/webcomp.key"
 
 echo -e "Firmware Mod Kit (ddwrt-gui-rebuild) $VERSION, (c)2011 Craig Heffner, Jeremy Collake\nhttp://www.bitsum.com\n"
 
@@ -38,5 +39,10 @@ then
 fi
 
 # Restore!
-$SUDO ./src/webcomp-tools/webdecomp --httpd="$HTTPD" --www="$WWW" --dir="$WEBDIR" --restore
+TMPFILE=`mktemp /tmp/$0.XXXXXX`
+# we actually pass a temporary copy of the keyfile to the webdecomp tool so that 
+# the actual keyfile won't be included in the compiled web file system
+$SUDO mv "$KEYFILE" "$TMPFILE"
+$SUDO ./src/webcomp-tools/webdecomp --httpd="$HTTPD" --www="$WWW" --dir="$WEBDIR" --key="$TMPFILE" --restore
+$SUDO mv "$TMPFILE" "$KEYFILE"