소스 검색

Install guix within image

Bob Mottram 7 년 전
부모
커밋
cdbf4de7e0
3개의 변경된 파일17개의 추가작업 그리고 2개의 파일을 삭제
  1. 1
    0
      src/freedombone-image-customise
  2. 13
    2
      src/freedombone-utils-guile
  3. 3
    0
      src/freedombone-utils-setup

+ 1
- 0
src/freedombone-image-customise 파일 보기

@@ -1469,6 +1469,7 @@ configure_user_interface
1469 1469
 image_setup_utils
1470 1470
 image_install_inadyn
1471 1471
 image_install_nodejs
1472
+image_install_guix
1472 1473
 image_preinstall_repos
1473 1474
 
1474 1475
 # remove downloaded packages

+ 13
- 2
src/freedombone-utils-guile 파일 보기

@@ -96,8 +96,6 @@ function install_guile {
96 96
 }
97 97
 
98 98
 function install_guix_get_architecture {
99
-    read_config_param ARCHITECTURE
100
-
101 99
     if [[ ${ARCHITECTURE} == *"386" || ${ARCHITECTURE} == *"686" ]]; then
102 100
         CURR_ARCH='i686'
103 101
     fi
@@ -137,6 +135,17 @@ function install_guix_user {
137 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 149
 function install_guix {
141 150
     if [[ $(app_is_installed install_guix) == "1" ]]; then
142 151
         return
@@ -145,6 +154,8 @@ function install_guix {
145 154
     apt-get -qy install wget xz-utils
146 155
 
147 156
     read_config_param MY_USERNAME
157
+    read_config_param ARCHITECTURE
158
+
148 159
     install_guix_get_architecture
149 160
 
150 161
     if [ ! -d $INSTALL_DIR/guix ]; then

+ 3
- 0
src/freedombone-utils-setup 파일 보기

@@ -997,6 +997,9 @@ function setup_utils {
997 997
 
998 998
     function_check setup_powerline
999 999
     setup_powerline
1000
+
1001
+    function_check install_guix
1002
+    install_guix
1000 1003
 }
1001 1004
 
1002 1005
 function setup_email {