installation: Clean the code.

installation/10install-dependencies.sh

@@ -6,11 +6,15 @@ set -e
 GIT_ROOT=`git rev-parse --show-toplevel`
 cd "$GIT_ROOT"/installation
 
+source 00env.sh
+
 # useful tools
 apt -y install sudo wget tree pip
 git config --global user.email "ophelie.gagnard@nexedi.com"
 git config --global user.name "Ophelie Gagnard"
 
+# the next line should be enabled when the following is merged and an egg containing the changes is released:
+# https://lab.nexedi.com/nexedi/slapos.libnetworkcache/merge_requests/8
 #pip install slapos.libnetworkcache
 NC_BRANCH=cmdline-selection
 NC_DIR="${NC_BRANCH}"_slapos.libnetworkcache # NC for NetworkCache

installation/30install-image.sh

@@ -52,10 +52,6 @@ networkcache-download --config ../tls-access-to-shacache/test.cfg --key river "t
 image_hash=$(sha512sum "$tmp_image_name" | cut -d' ' -f1)
 mv "$tmp_image_name" "$image_hash"
 echo image_hash = "$image_hash"
-# WGET DOWNLOADING METHOD
-#if [ ! -f "$image_hash" ]; then
-#	wget "$shacache_url/$image_hash"
-#fi
 mkdir -p /boot/efi/"$RELATIVE_EFI_IMAGE_DIR"
 cp "$image_hash" /boot/efi/"$RELATIVE_EFI_IMAGE_DIR"
 

installation/display-host-information.sh

@@ -5,7 +5,7 @@
 set -e
 
 # get the root of the git repository (requires git to be installed)
-GIT_ROOT=`git rev-parse --show-toplevel`
+GIT_ROOT=$(git rev-parse --show-toplevel)
 cd $GIT_ROOT
 
 # define useful variables