This commit is contained in:
Bob Mottram 2017-08-26 18:18:50 +01:00
parent 3edcda63d3
commit a609d7b5bc
1 changed files with 15 additions and 21 deletions

View File

@ -125,6 +125,17 @@ function install_guix_get_architecture {
fi fi
} }
function install_guix_user {
install_path=$1
if ! grep -q 'GUIX_LOCPATH' $install_path/.bashrc; then
echo 'export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale' >> $install_path/.bashrc
fi
if ! grep -q 'GUIX_PROFILE' $install_path/.bashrc; then
echo 'export GUIX_PROFILE=$HOME/.guix-profile' >> $install_path/.bashrc
echo 'source $GUIX_PROFILE/etc/profile' >> $install_path/.bashrc
fi
}
function install_guix { function install_guix {
if [[ $(app_is_installed install_guix) == "1" ]]; then if [[ $(app_is_installed install_guix) == "1" ]]; then
@ -199,27 +210,10 @@ function install_guix {
for i in /var/guix/profiles/per-user/root/guix-profile/share/info/* ; for i in /var/guix/profiles/per-user/root/guix-profile/share/info/* ;
do ln -s $i ; done do ln -s $i ; done
if ! grep -q 'GUIX_LOCPATH' /root/.bashrc; then install_guix_user /root
echo 'export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale' >> /root/.bashrc install_guix_user /etc/skel
fi install_guix_user /home/$MY_USERNAME
if ! grep -q 'GUIX_LOCPATH' /etc/skel/.bashrc; then
echo 'export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale' >> /etc/skel/.bashrc
fi
if ! grep -q 'GUIX_LOCPATH' /home/$MY_USERNAME/.bashrc; then
echo 'export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale' >> /home/$MY_USERNAME/.bashrc
fi
if ! grep -q 'GUIX_PROFILE' /root/.bashrc; then
echo 'export GUIX_PROFILE=$HOME/.guix-profile' >> /root/.bashrc
echo 'source $GUIX_PROFILE/etc/profile' >> /root/.bashrc
fi
if ! grep -q 'GUIX_PROFILE' /etc/skel/.bashrc; then
echo 'export GUIX_PROFILE=$HOME/.guix-profile' >> /etc/skel/.bashrc
echo 'source $GUIX_PROFILE/etc/profile' >> /etc/skel/.bashrc
fi
if ! grep -q 'GUIX_PROFILE' /home/$MY_USERNAME/.bashrc; then
echo 'export GUIX_PROFILE=$HOME/.guix-profile' >> /home/$MY_USERNAME/.bashrc
echo 'source $GUIX_PROFILE/etc/profile' >> /home/$MY_USERNAME/.bashrc
fi
guix package -i glibc-locales guix package -i glibc-locales
install_completed install_guix install_completed install_guix