Install guix within image

This commit is contained in:
Bob Mottram 2017-08-26 18:51:45 +01:00
parent a609d7b5bc
commit cdbf4de7e0
3 changed files with 17 additions and 2 deletions

View File

@ -1469,6 +1469,7 @@ configure_user_interface
image_setup_utils
image_install_inadyn
image_install_nodejs
image_install_guix
image_preinstall_repos
# remove downloaded packages

View File

@ -96,8 +96,6 @@ function install_guile {
}
function install_guix_get_architecture {
read_config_param ARCHITECTURE
if [[ ${ARCHITECTURE} == *"386" || ${ARCHITECTURE} == *"686" ]]; then
CURR_ARCH='i686'
fi
@ -137,6 +135,17 @@ function install_guix_user {
fi
}
function image_install_guix {
install_guix_get_architecture
if [ ! -d $rootdir$INSTALL_DIR/guix ]; then
mkdir -p $INSTALL_DIR/guix
fi
cd $rootdir$INSTALL_DIR/guix
if [ ! -f guix-binary-${GUIX_VERSION}.${CURR_ARCH}-linux.tar.xz ]; then
wget $GUIX_DOWNLOAD_URL/guix-binary-${GUIX_VERSION}.${CURR_ARCH}-linux.tar.xz
fi
}
function install_guix {
if [[ $(app_is_installed install_guix) == "1" ]]; then
return
@ -145,6 +154,8 @@ function install_guix {
apt-get -qy install wget xz-utils
read_config_param MY_USERNAME
read_config_param ARCHITECTURE
install_guix_get_architecture
if [ ! -d $INSTALL_DIR/guix ]; then

View File

@ -997,6 +997,9 @@ function setup_utils {
function_check setup_powerline
setup_powerline
function_check install_guix
install_guix
}
function setup_email {