Bob Mottram 9 年之前
父節點
當前提交
0e3cc7e07a
共有 1 個檔案被更改,包括 15 行新增11 行删除
  1. 15
    11
      src/freedombone-image-make

+ 15
- 11
src/freedombone-image-make 查看文件

59
 
59
 
60
 case "$MACHINE" in
60
 case "$MACHINE" in
61
     beaglebone)
61
     beaglebone)
62
-	extra_pkgs="$beaglebone_pkgs"
63
-	extra_opts="\
62
+    extra_pkgs="$beaglebone_pkgs"
63
+    extra_opts="\
64
  --variant minbase \
64
  --variant minbase \
65
  --bootoffset=2mib \
65
  --bootoffset=2mib \
66
  --bootsize 128M \
66
  --bootsize 128M \
70
  --foreign /usr/bin/qemu-arm-static \
70
  --foreign /usr/bin/qemu-arm-static \
71
  --roottype btrfs \
71
  --roottype btrfs \
72
 "
72
 "
73
-	;;
73
+    ;;
74
     virtualbox)
74
     virtualbox)
75
-	extra_opts="\
75
+    extra_opts="\
76
  --grub \
76
  --grub \
77
  --roottype btrfs \
77
  --roottype btrfs \
78
-"	;;
78
+"   ;;
79
     all)
79
     all)
80
-	extra_opts="\
80
+    extra_opts="\
81
  --grub \
81
  --grub \
82
  --roottype btrfs \
82
  --roottype btrfs \
83
-"	;;
83
+"   ;;
84
 esac
84
 esac
85
 
85
 
86
 # allow for lots of extra fun customization options.
86
 # allow for lots of extra fun customization options.
90
         development)
90
         development)
91
             extra_pkgs="$extra_pkgs $dev_pkgs"
91
             extra_pkgs="$extra_pkgs $dev_pkgs"
92
             ;;
92
             ;;
93
-	xfce)
94
-	    extra_pkgs="$extra_pkgs $xfce_pkgs"
95
-	    ;;
93
+    xfce)
94
+        extra_pkgs="$extra_pkgs $xfce_pkgs"
95
+        ;;
96
     esac
96
     esac
97
 done
97
 done
98
 
98
 
111
 
111
 
112
 echo 'Making customised customisation script'
112
 echo 'Making customised customisation script'
113
 TEMP_CUSTOMISE=/etc/freedombone/image-customise
113
 TEMP_CUSTOMISE=/etc/freedombone/image-customise
114
-sudo cp /usr/local/bin/freedombone-image-customise $TEMP_CUSTOMISE
114
+if [ -f /usr/local/bin/freedombone-image-customise ]; then
115
+    sudo cp /usr/local/bin/freedombone-image-customise $TEMP_CUSTOMISE
116
+else
117
+    sudo cp /usr/bin/freedombone-image-customise $TEMP_CUSTOMISE
118
+fi
115
 sudo sed -i "s|MY_USERNAME=.*|MY_USERNAME=${MY_USERNAME}|g" $TEMP_CUSTOMISE
119
 sudo sed -i "s|MY_USERNAME=.*|MY_USERNAME=${MY_USERNAME}|g" $TEMP_CUSTOMISE
116
 sudo sed -i "s|MY_PASSWORD=.*|MY_PASSWORD=${MY_PASSWORD}|g" $TEMP_CUSTOMISE
120
 sudo sed -i "s|MY_PASSWORD=.*|MY_PASSWORD=${MY_PASSWORD}|g" $TEMP_CUSTOMISE
117
 sudo sed -i "s|ROUTER_IP_ADDRESS=.*|ROUTER_IP_ADDRESS=${ROUTER_IP_ADDRESS}|g" $TEMP_CUSTOMISE
121
 sudo sed -i "s|ROUTER_IP_ADDRESS=.*|ROUTER_IP_ADDRESS=${ROUTER_IP_ADDRESS}|g" $TEMP_CUSTOMISE