|
@@ -35,12 +35,19 @@ PROJECT_NAME='freedombone'
|
35
|
35
|
export TEXTDOMAIN=${PROJECT_NAME}-image
|
36
|
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
|
45
|
#get the project repo
|
39
|
46
|
PROJECT_REPO="https://github.com/bashrc/${PROJECT_NAME}"
|
40
|
47
|
UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
|
41
|
48
|
for f in $UTILS_FILES
|
42
|
49
|
do
|
43
|
|
- source $f
|
|
50
|
+ source $f
|
44
|
51
|
done
|
45
|
52
|
read_config_param PROJECT_REPO
|
46
|
53
|
|
|
@@ -176,20 +183,11 @@ function image_setup {
|
176
|
183
|
fi
|
177
|
184
|
sudo pacman -S --noconfirm device-mapper libaio liburcu fakeroot
|
178
|
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
|
190
|
fi
|
192
|
|
- sudo mv ~/develop/debootstrap/scripts/* /usr/share/debootstrap/scripts
|
193
|
191
|
;;
|
194
|
192
|
*)
|
195
|
193
|
echo $'Unkown operating system'
|