Fix extraction of Armbian images (part of guysoft#7)

src/custompios

@@ -37,17 +37,17 @@ pushd $BASE_WORKSPACE
   if [ -e *.img ]; then  
     rm *.img
   fi
-  if [ ! -f $BASE_ZIP_IMG ] || [ "$BASE_ZIP_IMG" == "" ]; then
+  if [ ! -f "$BASE_ZIP_IMG" ] || [ "$BASE_ZIP_IMG" == "" ]; then
     echo "Error: could not find image: $BASE_ZIP_IMG"
     exit 1
   fi
-  unzip $BASE_ZIP_IMG
+  7za x "$BASE_ZIP_IMG"
   BASE_IMG_PATH=`ls | grep '.img\|.raw' | head -n 1`
   if [ ! -f "$BASE_IMG_PATH" ]; then
     echo "Error, can't find image path, did you place an image in the image folder?"
     exit 1
   fi
-  export CUSTOM_PI_OS_BUILDBASE=$(basename $BASE_IMG_PATH)
+  export CUSTOM_PI_OS_BUILDBASE=$(basename "$BASE_IMG_PATH")
 
   if [ -n "$BASE_IMAGE_ENLARGEROOT" ]
   then

src/dist_generators/dist_example/src/vagrant/setup.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 sudo apt-get update
-sudo apt-get install -y gawk util-linux realpath git qemu-user-static unzip zip
+sudo apt-get install -y gawk util-linux realpath git qemu-user-static p7zip-full unzip zip