Refactor logic to allow overwriting modname

src/META-INF/com/google/android/update-binary

@@ -70,10 +70,6 @@ done;
 
 $bootmode && filedir="/dev/tmp/$modname" || filedir="/tmp/$modname";
 tmplibdir="$filedir/tmplibdir";
-moddir="/data/media/0/$modname";
-backupdir="$moddir/Backup";
-initdfile="/system/etc/init.d/10-$modname";
-addondfile="/system/addon.d/10-$modname.sh";
 
 $bootmode && forcesys=no;
 case "$(basename "$zipfile")" in
@@ -322,6 +318,11 @@ unzip -o "$zipfile" "defconf" -d "$filedir/";
 chmod 0777 "$filedir/defconf";
 . "$filedir/defconf" || abort "Could not execute default config";
 
+moddir="/data/media/0/$modname";
+backupdir="$moddir/Backup";
+initdfile="/system/etc/init.d/10-$modname";
+addondfile="/system/addon.d/10-$modname.sh";
+
 ui_print " ";
 ui_print "Package: $variant";
 ui_print "Version: $ver";