Przeglądaj źródła

Install guix within image

Bob Mottram 7 lat temu
rodzic
commit
cdbf4de7e0

+ 1
- 0
src/freedombone-image-customise Wyświetl plik

1469
 image_setup_utils
1469
 image_setup_utils
1470
 image_install_inadyn
1470
 image_install_inadyn
1471
 image_install_nodejs
1471
 image_install_nodejs
1472
+image_install_guix
1472
 image_preinstall_repos
1473
 image_preinstall_repos
1473
 
1474
 
1474
 # remove downloaded packages
1475
 # remove downloaded packages

+ 13
- 2
src/freedombone-utils-guile Wyświetl plik

96
 }
96
 }
97
 
97
 
98
 function install_guix_get_architecture {
98
 function install_guix_get_architecture {
99
-    read_config_param ARCHITECTURE
100
-
101
     if [[ ${ARCHITECTURE} == *"386" || ${ARCHITECTURE} == *"686" ]]; then
99
     if [[ ${ARCHITECTURE} == *"386" || ${ARCHITECTURE} == *"686" ]]; then
102
         CURR_ARCH='i686'
100
         CURR_ARCH='i686'
103
     fi
101
     fi
137
     fi
135
     fi
138
 }
136
 }
139
 
137
 
138
+function image_install_guix {
139
+    install_guix_get_architecture
140
+    if [ ! -d $rootdir$INSTALL_DIR/guix ]; then
141
+        mkdir -p $INSTALL_DIR/guix
142
+    fi
143
+    cd $rootdir$INSTALL_DIR/guix
144
+    if [ ! -f guix-binary-${GUIX_VERSION}.${CURR_ARCH}-linux.tar.xz ]; then
145
+        wget $GUIX_DOWNLOAD_URL/guix-binary-${GUIX_VERSION}.${CURR_ARCH}-linux.tar.xz
146
+    fi
147
+}
148
+
140
 function install_guix {
149
 function install_guix {
141
     if [[ $(app_is_installed install_guix) == "1" ]]; then
150
     if [[ $(app_is_installed install_guix) == "1" ]]; then
142
         return
151
         return
145
     apt-get -qy install wget xz-utils
154
     apt-get -qy install wget xz-utils
146
 
155
 
147
     read_config_param MY_USERNAME
156
     read_config_param MY_USERNAME
157
+    read_config_param ARCHITECTURE
158
+
148
     install_guix_get_architecture
159
     install_guix_get_architecture
149
 
160
 
150
     if [ ! -d $INSTALL_DIR/guix ]; then
161
     if [ ! -d $INSTALL_DIR/guix ]; then

+ 3
- 0
src/freedombone-utils-setup Wyświetl plik

997
 
997
 
998
     function_check setup_powerline
998
     function_check setup_powerline
999
     setup_powerline
999
     setup_powerline
1000
+
1001
+    function_check install_guix
1002
+    install_guix
1000
 }
1003
 }
1001
 
1004
 
1002
 function setup_email {
1005
 function setup_email {