local

src/freedombone-image-make

@@ -59,8 +59,8 @@ echo Building $MACHINE Freedombone for $ARCHITECTURE.
 
 case "$MACHINE" in
     beaglebone)
-	extra_pkgs="$beaglebone_pkgs"
-	extra_opts="\
+    extra_pkgs="$beaglebone_pkgs"
+    extra_opts="\
  --variant minbase \
  --bootoffset=2mib \
  --bootsize 128M \
@@ -70,17 +70,17 @@ case "$MACHINE" in
  --foreign /usr/bin/qemu-arm-static \
  --roottype btrfs \
 "
-	;;
+    ;;
     virtualbox)
-	extra_opts="\
+    extra_opts="\
  --grub \
  --roottype btrfs \
-"	;;
+"   ;;
     all)
-	extra_opts="\
+    extra_opts="\
  --grub \
  --roottype btrfs \
-"	;;
+"   ;;
 esac
 
 # allow for lots of extra fun customization options.
@@ -90,9 +90,9 @@ do
         development)
             extra_pkgs="$extra_pkgs $dev_pkgs"
             ;;
-	xfce)
-	    extra_pkgs="$extra_pkgs $xfce_pkgs"
-	    ;;
+    xfce)
+        extra_pkgs="$extra_pkgs $xfce_pkgs"
+        ;;
     esac
 done
 
@@ -111,7 +111,11 @@ fi
 
 echo 'Making customised customisation script'
 TEMP_CUSTOMISE=/etc/freedombone/image-customise
-sudo cp /usr/local/bin/freedombone-image-customise $TEMP_CUSTOMISE
+if [ -f /usr/local/bin/freedombone-image-customise ]; then
+    sudo cp /usr/local/bin/freedombone-image-customise $TEMP_CUSTOMISE
+else
+    sudo cp /usr/bin/freedombone-image-customise $TEMP_CUSTOMISE
+fi
 sudo sed -i "s|MY_USERNAME=.*|MY_USERNAME=${MY_USERNAME}|g" $TEMP_CUSTOMISE
 sudo sed -i "s|MY_PASSWORD=.*|MY_PASSWORD=${MY_PASSWORD}|g" $TEMP_CUSTOMISE
 sudo sed -i "s|ROUTER_IP_ADDRESS=.*|ROUTER_IP_ADDRESS=${ROUTER_IP_ADDRESS}|g" $TEMP_CUSTOMISE