Force busybox df, fix previnstall.sh (offensive-security#709)

Signed-off-by: James Christopher Adduono <[email protected]>
lciclcAzzLab · Dec 16, 2016 · fb4d2fe · fb4d2fe
1 parent e23e1a7
commit fb4d2fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nethunter-installer/common/tools/freespace.sh b/nethunter-installer/common/tools/freespace.sh
@@ -40,7 +40,7 @@ SA=/system/app
 DA=/data/app
 
 UpdateFreeSpace() {
-	FreeSpace=$(df -m /system | awk '!/Used/ {print $4}')
+	FreeSpace=$(busybox df -m /system | awk '!/Used/ {print $4}')
 }
 
 UpdateFreeSpace
@@ -78,4 +78,4 @@ if [ ! "$FreeSpace" -gt "$SpaceRequired" ]; then
 	exit 1
 fi
 
-exit 0
+exit 0
diff --git a/nethunter-installer/update/tools/previnstall.sh b/nethunter-installer/update/tools/previnstall.sh
@@ -32,7 +32,7 @@ if [ -d "$NH" ]; then
 elif [ -d "$NHAPP" ]; then
 	print "Detected previous install of Kali $ARCH, moving chroot..."
 	mv "$NHAPP" "$NHSYS"
-}
+fi
 
 # Just to be safe lets remove old version of NetHunter app
 rm -rf /data/data/com.offsec.nethunter