ソースを参照

Use jessie script from repo

Bob Mottram 8 年 前
コミット
f2db64be89
共有1 個のファイルを変更した12 個の追加14 個の削除を含む
  1. 12
    14
      src/freedombone-image

+ 12
- 14
src/freedombone-image ファイルの表示

35
 export TEXTDOMAIN=${PROJECT_NAME}-image
35
 export TEXTDOMAIN=${PROJECT_NAME}-image
36
 export TEXTDOMAINDIR="/usr/share/locale"
36
 export TEXTDOMAINDIR="/usr/share/locale"
37
 
37
 
38
+PROJECT_INSTALL_DIR=/usr/local/bin
39
+if [ -f /usr/bin/${PROJECT_NAME} ]; then
40
+    PROJECT_INSTALL_DIR=/usr/bin
41
+fi
42
+
43
+source $PROJECT_INSTALL_DIR/${PROJECT_NAME}-vars
44
+
38
 #get the project repo
45
 #get the project repo
39
 PROJECT_REPO="https://github.com/bashrc/${PROJECT_NAME}"
46
 PROJECT_REPO="https://github.com/bashrc/${PROJECT_NAME}"
40
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
47
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
41
 for f in $UTILS_FILES
48
 for f in $UTILS_FILES
42
 do
49
 do
43
-  source $f
50
+    source $f
44
 done
51
 done
45
 read_config_param PROJECT_REPO
52
 read_config_param PROJECT_REPO
46
 
53
 
176
             fi
183
             fi
177
             sudo pacman -S --noconfirm device-mapper libaio liburcu fakeroot
184
             sudo pacman -S --noconfirm device-mapper libaio liburcu fakeroot
178
             cd ~/develop/multipath-tools
185
             cd ~/develop/multipath-tools
179
-            makepkg
180
-            makepkg -i
181
-            cd ~/develop
182
-            if [ ! -f ~/develop/debootstrap_${DEBOOTSTRAP_VERSION}.tar.gz ]; then
183
-                wget http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_${DEBOOTSTRAP_VERSION}.tar.gz
184
-            fi
185
-            if [ ! -f ~/develop/debootstrap_${DEBOOTSTRAP_VERSION}.tar.gz ]; then
186
-                echo $'Failed to download debootstrap code'
187
-                return
188
-            fi
189
-            if [ ! -d ~/develop/debootstrap/scripts ]; then
190
-                tar -xzvf debootstrap_${DEBOOTSTRAP_VERSION}.tar.gz
186
+            makepkg --force --noconfirm
187
+            makepkg -i --force --noconfirm
188
+            if [ ! -f /usr/share/debootstrap/scripts/${DEBIAN_VERSION} ]; then
189
+                sudo wget https://raw.githubusercontent.com/bashrc/freedombone/stockholm/image_build/debootstrap/scripts/${DEBIAN_VERSION} /usr/share/debootstrap/scripts/${DEBIAN_VERSION}
191
             fi
190
             fi
192
-            sudo mv ~/develop/debootstrap/scripts/* /usr/share/debootstrap/scripts
193
             ;;
191
             ;;
194
         *)
192
         *)
195
             echo $'Unkown operating system'
193
             echo $'Unkown operating system'