various fixes

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index 15ae5c2acd17085444d8892c4550e963b0bb990b..b883fec1ce82becebcc92b6963985338508ac3d8 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -15,7 +15,8 @@
 
 ### setup
 source /a/bin/errhandle/err
-src="${BASH_SOURCE%/*}"
+src="$(readlink -f -- "$BASH_SOURCE")"; src=${src%/*} # directory of this file
+
 source $src/pkgs
 
 set -x
@@ -48,7 +49,7 @@ if isdeb; then
 fi
 
 # avoid ptompts!
-debconf-set-selections <<EOF
+s debconf-set-selections <<EOF
 popularity-contest popularity-contest/participate boolean true
 EOF
 
@@ -1675,6 +1676,21 @@ esac
 
 /a/bin/buildscripts/pithosfly
 
+
+# based on guix manual instructions, also added code to profile
+pi nscd
+if ! type -p guix >/dev/null; then
+  cd $(mktemp -d)
+  wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
+  # added some stuff to envonment.sh for profile based on
+  # manual instructions
+  # wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -
+  # echo is to get past prompt
+  echo | sudo -E HOME=/home/iank bash guix-install.sh
+  guix install glibc-utf8-locales
+  guix package --install guile
+fi
+
 #### tor
 case $distro in
   # based on