Merge branch 'stretch' of https://github.com/bashrc/freedombone

src/freedombone-base-tripwire

@@ -139,7 +139,7 @@ function install_tripwire {
     # Avoid logging the changed database
     sed -i "s|\$(TWETC)/tw.pol.*||g" /etc/tripwire/twpol.txt
     # site key name
-    sed -i "s|$(TWETC)/site.key|\$(TWETC)/\$(HOSTNAME)-site.key|g" /etc/tripwire/twpol.txt
+    sed -i "s|\$(TWETC)/site.key|\$(TWETC)/\$(HOSTNAME)-site.key|g" /etc/tripwire/twpol.txt
 
     # create the policy
     echo '

src/freedombone-image-customise

@@ -339,7 +339,6 @@ fi
 EOF
 
     { echo "MY_USERNAME=${MY_USERNAME}";
-      echo "SSH_PORT=${SSH_PORT}";
       echo '# initial setup of the system';
       echo 'if [ -f ~/.initial_setup ]; then';
       echo '    if [ -f ~/login.txt ]; then';

src/freedombone-utils-go

@@ -214,7 +214,6 @@ function mesh_upgrade_golang {
         echo $"golang binaries directory not found ${rootdir}/home/go/go${GO_VERSION}/bin"
         exit 356356785
     fi
-    ls -la "${rootdir}/home/go/go${GO_VERSION}"
     if ! cp "${rootdir}/home/go/go${GO_VERSION}/bin/"* "${rootdir}/usr/bin"; then
         ls -la "${rootdir}/home/go/go${GO_VERSION}"
         echo $'Copying golang binaries failed'