Function name is an array

src/freedombone-app-batman

 }
 
 function configure_firewall_for_batman {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $ENABLE_BATMAN != "yes" ]]; then
 
     function_check save_firewall_settings
     save_firewall_settings
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function reconfigure_batman {

src/freedombone-app-dlna

 }
 
 function configure_firewall_for_dlna {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
 
     systemctl restart avahi-daemon
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function backup_local_dlna {
 }
 
 function script_for_attaching_usb_drive {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     echo '#!/bin/bash' > /usr/bin/attach-music
     echo 'exit 0' >> /usr/bin/remove-music
     chmod +x /usr/bin/remove-music
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function install_dlna {

src/freedombone-app-ipfs

 }
 
 function configure_firewall_for_ipfs {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $ONION_ONLY != "no" ]]; then
     fi
 
     firewall_add IPFS $IPFS_PORT tcp
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function mesh_install_ipfs_js {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
 
     chroot ${rootdir} systemctl enable ${IPFS_DAEMON_NAME}
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function install_ipfs_js {

src/freedombone-app-irc

     if [ ! -d /etc/ngircd ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ ${INSTALLED_WITHIN_DOCKER} == "yes" ]]; then

src/freedombone-app-keyserver

     firewall_add keyserver 11370 tcp
     firewall_add keyserver 11371 tcp
     firewall_add keyserver 11372 tcp
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function keyserver_reset_database {

src/freedombone-app-mumble

 }
 
 function configure_firewall_for_mumble {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $ONION_ONLY != "no" ]]; then
         return
     fi
     firewall_add Mumble ${MUMBLE_PORT}
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function install_mumble {

src/freedombone-app-rss

     set_repo_commit $RSS_READER_GNUSOCIAL_PATH "rss reader gnusocial commit" "$RSS_READER_GNUSOCIAL_COMMIT" $RSS_READER_GNUSOCIAL_REPO
     chown -R www-data:www-data $RSS_READER_GNUSOCIAL_PATH
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
         fi
     fi
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 

src/freedombone-app-syncthing

 }
 
 function configure_firewall_for_syncthing {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     firewall_add Syncthing ${SYNCTHING_PORT}
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function install_syncthing_repo {

src/freedombone-app-tox

 
 function configure_firewall_for_tox {
     if [ ! $INSTALLING_MESH ]; then
-        if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+        if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
             return
         fi
     fi
     fi
 
     firewall_add Tox ${TOX_PORT}
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function tox_avahi {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
 
     systemctl restart avahi-daemon
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function install_tox_node {

src/freedombone-app-xmpp

     if [ ! -d /etc/prosody ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
     firewall_add XMPP 5269 tcp
     firewall_add XMPP 5280 tcp
     firewall_add XMPP 5281 tcp
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function remove_xmpp {

src/freedombone-app-zeronet

 }
 
 function configure_firewall_for_zeronet {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     firewall_add ZeroNet ${ZERONET_PORT}
     firewall_add Tracker ${TRACKER_PORT}
     firewall_add Tracker 1900 udp
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function install_zeronet_blog {

src/freedombone-base-email

 }
 
 function configure_email_onion {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $SYSTEM_TYPE == "mesh"* ]]; then
     set_completion_param "email onion domain" "${onion_address}"
     add_email_hostname "$onion_address"
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function check_email_address_exists {
     function_check set_repo_commit
     set_repo_commit $INSTALL_DIR/gpgit "gpgit commit" "$GPGIT_COMMIT" $GPGIT_REPO
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
         echo -n '| /usr/bin/gpgit.pl --encrypt-mode prefer-inline --inline-flatten $USER@' >> /etc/skel/.procmailrc
         echo "$DEFAULT_DOMAIN_NAME" >> /etc/skel/.procmailrc
     fi
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function encrypt_outgoing_email {
     if [ ! -d /etc/exim4 ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $GPG_ENCRYPT_STORED_EMAIL != "yes" ]]; then
         sed -i "s|set pgp_encrypt_sign_command.*|set pgp_encrypt_sign_command=\"/usr/lib/mutt/pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --trust-model always --encrypt-to $MY_GPG_PUBLIC_KEY_ID -- -r %r -- %f\"|g" /home/$MY_USERNAME/.muttrc
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function encrypt_all_email {
         fi
     fi
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
         chmod 600 /home/$MY_USERNAME/README
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function email_client {
     if [ ! -d /etc/exim4 ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     apt-get -yq install lynx abook urlview mutt
         chown ${GENERIC_IMAGE_USERNAME}:${GENERIC_IMAGE_USERNAME} /home/${GENERIC_IMAGE_USERNAME}/.mutt-alias
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function email_archiving {
     function_check set_repo_commit
     set_repo_commit $INSTALL_DIR/cleanup-maildir "cleanup-maildir commit" "$CLEANUP_MAILDIR_COMMIT" $CLEANUP_MAILDIR_REPO
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
         fi
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # Ensure that the from field is correct when sending email from Mutt
 function email_from_address {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
         echo "set from='$MY_NAME <$MY_EMAIL_ADDRESS>'" >> /home/$MY_USERNAME/.muttrc
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function create_public_mailing_list {
     if [ ! -d /etc/exim4 ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [ ! $PUBLIC_MAILING_LIST ]; then
 
     ${PROJECT_NAME}-addlist -u $MY_USERNAME -l "$PUBLIC_MAILING_LIST" -s "$PUBLIC_MAILING_LIST"
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function create_private_mailing_list {
     if [ ! -d /etc/exim4 ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [ ! $PRIVATE_MAILING_LIST ]; then
     chmod 0000 /etc/shadow
     chmod 0000 /etc/gshadow
     #exim -d -bt $PRIVATE_MAILING_LIST@$DEFAULT_DOMAIN_NAME
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function split_gpg_key_into_fragments {
       Now on your internet router forward ports
      25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}
 "
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         if [[ $SYSTEM_TYPE == "mail"* ]]; then
             function_check backup_to_friends_servers
             backup_to_friends_servers
         fi
         return
     fi
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
     if [[ $SYSTEM_TYPE == "mail"* ]]; then
         function_check backup_to_friends_servers
         backup_to_friends_servers
     if [ ! -d /etc/exim4 ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [ ! -f /home/$MY_USERNAME/.procmailrc ]; then
         chmod 6755 /usr/bin/procmail
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function handle_admin_emails {
     if [ ! -d /etc/exim4 ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     apt-get -yq install exim4-daemon-heavy
     function_check cron_add_mins
     cron_add_mins 10 "$script_name 2> /dev/null"
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function configure_imap {
     if [ ! -d /etc/exim4 ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     fi
 
     systemctl restart dovecot
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function configure_imap_client_certs {
     if [ ! -d /etc/exim4 ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     # http://strange.systems/certificate-based-auth-with-dovecot-sendmail/
     echo 0001 > /etc/ssl/sslserial
     #${PROJECT_NAME}-clientcert -u $MY_USERNAME
     systemctl restart dovecot
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function create_gpg_subkey {
     if [ ! -d /etc/exim4 ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     apt-get -yq install gnupg
 
     MY_GPG_SUBKEY_ID=$(gpg_pubkey_from_email "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function gpg_key_exists {
     if [ ! -d /etc/exim4 ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     apt-get -yq install gnupg dirmngr
                 if [ -d /home/$MY_USERNAME/.gnupg/crls.d ]; then
                     chmod +x /home/$MY_USERNAME/.gnupg/crls.d
                 fi
-                mark_completed $FUNCNAME
+                mark_completed "${FUNCNAME[0]}"
                 return
             fi
         fi
         fi
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function refresh_gpg_keys {
     if [[ $SYSTEM_TYPE == "mesh"* ]]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     install_email_basic
     configure_email_onion
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-base-tripwire

 }
 
 function install_tripwire {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
 
        ' | twadmin --create-polfile -S /etc/tripwire/${HOSTNAME}-site.key /etc/tripwire/twpol.txt
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-utils-avahi

         exit 52925
     fi
 
-    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /etc/avahi/services/${service_name}.service
-    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /etc/avahi/services/${service_name}.service
-    echo '<service-group>' >> /etc/avahi/services/${service_name}.service
-    echo "  <name replace-wildcards=\"yes\">%h ${service_type}</name>" >> /etc/avahi/services/${service_name}.service
-    echo '  <service>' >> /etc/avahi/services/${service_name}.service
-    echo "    <type>_${service_type}._${service_protocol}</type>" >> /etc/avahi/services/${service_name}.service
-    echo "    <port>${service_port}</port>" >> /etc/avahi/services/${service_name}.service
+    { echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->';
+      echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">';
+      echo '<service-group>';
+      echo "  <name replace-wildcards=\"yes\">%h ${service_type}</name>";
+      echo '  <service>';
+      echo "    <type>_${service_type}._${service_protocol}</type>";
+      echo "    <port>${service_port}</port>"; }  > "/etc/avahi/services/${service_name}.service"
+
     if [ "$service_description" ]; then
-        echo "    <txt-record>$service_description</txt-record>" >> /etc/avahi/services/${service_name}.service
+        echo "    <txt-record>$service_description</txt-record>" >> "/etc/avahi/services/${service_name}.service"
     fi
-    echo '  </service>' >> /etc/avahi/services/${service_name}.service
-    echo '</service-group>' >> /etc/avahi/services/${service_name}.service
+
+    { echo '  </service>';
+      echo '</service-group>'; } >> "/etc/avahi/services/${service_name}.service"
 }
 
 function mesh_avahi {
 
     decarray=( 1 2 3 4 5 6 7 8 9 0 )
     PEER_ID=${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}
-    sed -i "s|#host-name=.*|host-name=P$PEER_ID|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|use-ipv4=.*|use-ipv4=no|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|use-ipv6=.*|use-ipv6=yes|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|#allow-interfaces=.*|allow-interfaces=wlan0, wlan1, wlan2, wlan3, wlan4, wlan5|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|allow-interfaces=.*|allow-interfaces=wlan0, wlan1, wlan2, wlan3, wlan4, wlan5|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|#deny-interfaces=.*|deny-interfaces=eth0, eth1, eth2, eth3, eth4, eth5|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|deny-interfaces=.*|deny-interfaces=eth0, eth1, eth2, eth3, eth4, eth5|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|disallow-other-stacks=.*|disallow-other-stacks=yes|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|#publish_addresses=.*|publish_addresses=yes|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|publish_addresses=.*|publish_addresses=yes|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|#publish-hinfo=.*|publish-hinfo=no|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|publish-hinfo=.*|publish-hinfo=no|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|#publish-workstation=.*|publish-workstation=no|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|publish-workstation=.*|publish-workstation=no|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|#publish-domain=.*|publish-domain=yes|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|publish-domain=.*|publish-domain=yes|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|#publish-a-on-ipv6=.*|publish-a-on-ipv6=yes|g" $rootdir/etc/avahi/avahi-daemon.conf
-    sed -i "s|publish-a-on-ipv6=.*|publish-a-on-ipv6=yes|g" $rootdir/etc/avahi/avahi-daemon.conf
-
-    if [ ! -d $rootdir/etc/avahi/services ]; then
-        mkdir -p $rootdir/etc/avahi/services
+    sed -i "s|#host-name=.*|host-name=P$PEER_ID|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|use-ipv4=.*|use-ipv4=no|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|use-ipv6=.*|use-ipv6=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|#allow-interfaces=.*|allow-interfaces=wlan0, wlan1, wlan2, wlan3, wlan4, wlan5|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|allow-interfaces=.*|allow-interfaces=wlan0, wlan1, wlan2, wlan3, wlan4, wlan5|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|#deny-interfaces=.*|deny-interfaces=eth0, eth1, eth2, eth3, eth4, eth5|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|deny-interfaces=.*|deny-interfaces=eth0, eth1, eth2, eth3, eth4, eth5|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|disallow-other-stacks=.*|disallow-other-stacks=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|#publish_addresses=.*|publish_addresses=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|publish_addresses=.*|publish_addresses=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|#publish-hinfo=.*|publish-hinfo=no|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|publish-hinfo=.*|publish-hinfo=no|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|#publish-workstation=.*|publish-workstation=no|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|publish-workstation=.*|publish-workstation=no|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|#publish-domain=.*|publish-domain=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|publish-domain=.*|publish-domain=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|#publish-a-on-ipv6=.*|publish-a-on-ipv6=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+    sed -i "s|publish-a-on-ipv6=.*|publish-a-on-ipv6=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+
+    if [ ! -d "$rootdir/etc/avahi/services" ]; then
+        mkdir -p "$rootdir/etc/avahi/services"
     fi
 
     # remove an avahi service which isn't used
-    if [ -f $rootdir/etc/avahi/services/udisks.service ]; then
-        rm $rootdir/etc/avahi/services/udisks.service
+    if [ -f "$rootdir/etc/avahi/services/udisks.service" ]; then
+        rm "$rootdir/etc/avahi/services/udisks.service"
     fi
 
     # Add a mesh routing protocol service
-    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > $rootdir/etc/avahi/services/routing.service
-    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> $rootdir/etc/avahi/services/routing.service
-    echo '<service-group>' >> $rootdir/etc/avahi/services/routing.service
-    echo '  <name replace-wildcards="yes">%h routing</name>' >> $rootdir/etc/avahi/services/routing.service
-    echo '  <service>' >> $rootdir/etc/avahi/services/routing.service
-    echo '    <type>_bmx6._tcp</type>' >> $rootdir/etc/avahi/services/routing.service
-    echo '  </service>' >> $rootdir/etc/avahi/services/routing.service
-    echo '</service-group>' >> $rootdir/etc/avahi/services/routing.service
+    { echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->';
+      echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">';
+      echo '<service-group>';
+      echo '  <name replace-wildcards="yes">%h routing</name>';
+      echo '  <service>';
+      echo '    <type>_bmx6._tcp</type>';
+      echo '  </service>';
+      echo '</service-group>'; } > "$rootdir/etc/avahi/services/routing.service"
 
     # keep the daemon running
     WATCHDOG_SCRIPT_NAME="keepon"
-    echo '' >> $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
-    echo '# keep avahi daemon running' >> $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
-    echo 'AVAHI_RUNNING=$(pgrep avahi-daemon > /dev/null && echo Running)' >> $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
-    echo 'if [ ! $AVAHI_RUNNING ]; then' >> $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
-    echo '  systemctl start avahi-daemon' >> $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
-    echo '  echo -n $CURRENT_DATE >> $LOGFILE' >> $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
-    echo '  echo " Avahi daemon restarted" >> $LOGFILE' >> $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
-    echo 'fi' >> $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
-    chmod +x $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
+    { echo '';
+      echo '# keep avahi daemon running';
+      echo "AVAHI_RUNNING=\$(pgrep avahi-daemon > /dev/null && echo Running)";
+      echo "if [ ! \$AVAHI_RUNNING ]; then";
+      echo '  systemctl start avahi-daemon';
+      echo "  echo -n \$CURRENT_DATE >> \$LOGFILE";
+      echo "  echo \" Avahi daemon restarted\" >> \$LOGFILE";
+      echo 'fi'; } >> "$rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME"
+    chmod +x "$rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME"
 }
 
 function install_avahi {
-    if [ $INSTALLING_MESH ]; then
+    if [ "$INSTALLING_MESH" ]; then
         mesh_avahi
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     # only enable avahi if we're doing mesh networking
         sed -i "s|host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function configure_firewall_for_avahi {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     iptables -A INPUT -p tcp --dport 548 -j ACCEPT
     iptables -A INPUT -p udp --dport 5354 -j ACCEPT
     function_check save_firewall_settings
     save_firewall_settings
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately there is no "exit 0"

src/freedombone-utils-backup

 }
 
 function configure_backup_key {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     apt-get -yq install gnupg dirmngr
     shred -zu ${MY_BACKUP_KEY}_public.asc
     shred -zu ${MY_BACKUP_KEY}_private.asc
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function backup_to_friends_servers {

src/freedombone-utils-cmake

         fi
     fi
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     fi
     make install
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately there is no "exit 0"

src/freedombone-utils-cron

     # The predictable default timing of Debian cron jobs might
     # be exploitable knowledge. Avoid too much predictability
     # by randomizing the times when cron jobs run
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
 
     systemctl restart cron
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function schedule_stig_tests {

src/freedombone-utils-cryptopp

         fi
     fi
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     fi
     make install
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately there is no "exit 0"

src/freedombone-utils-database

 }
 
 function install_mariadb {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     apt-get -yq install software-properties-common debconf-utils
 
     mariadb_create_root_user
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function backup_databases_script_header {
         sed -i "s|/usr/bin/repairdatabase|${PROJECT_NAME}-repair-database|g" /etc/cron.hourly/repair
     fi
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     chmod 600 /etc/cron.hourly/repair
     chmod +x /etc/cron.hourly/repair
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function remove_database {

src/freedombone-utils-dns

     fi
 
     # currently inadyn doesn't work as expected with freeDNS, so this is a workaround
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $DDNS_PROVIDER != *"freedns"* ]]; then
         systemctl restart cron
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function add_ddns_domain {
 }
 
 function configure_dns {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     # prevent resolv.conf from changing
     resolvconf -u
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function set_hostname {
 }
 
 function set_your_domain_name {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     function_check set_hostname
     set_hostname $DEFAULT_DOMAIN_NAME
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function configure_firewall_for_dns {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
     iptables -A INPUT -p udp -m udp --dport 1024:65535 --sport 53 -j ACCEPT
     function_check save_firewall_settings
     save_firewall_settings
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-utils-filesystem

     set_repo_commit $INSTALL_DIR/tomb "tomb commit" "$TOMB_COMMIT" $TOMB_REPO
 
     if [ -f $COMPLETION_FILE ]; then
-        if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+        if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
             return
         fi
     fi
         exit 93462
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function defrag_filesystem {

src/freedombone-utils-final

 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 function install_final {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     # unmount any attached usb drive
     split_gpg_key_into_fragments
     lockdown_permissions
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
     clear
     echo ''
 

src/freedombone-utils-firewall

     if [ $INSTALLING_MESH ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     iptables -A INPUT -s 215.0.0.0/8 -j DROP
     iptables -A OUTPUT -s 215.0.0.0/8 -j DROP
     save_firewall_settings
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function global_rate_limit {
         # recreate the firewall to remove RELATED
         sed -i "/firewall/d" $COMPLETION_FILE
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
     # Incoming malformed NULL packets:
     iptables -A INPUT -p tcp --tcp-flags ALL NONE -j DROP
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function firewall_drop_telnet {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     # telnet isn't enabled as an input and we can also
     iptables -A OUTPUT -p udp --dport telnet -j REJECT
     function_check save_firewall_settings
     save_firewall_settings
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function configure_firewall_ping {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     # Only allow ping for mesh installs
     iptables -A OUTPUT -p icmp --icmp-type echo-reply -j ACCEPT
     function_check save_firewall_settings
     save_firewall_settings
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function configure_internet_protocol {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $SYSTEM_TYPE == "mesh"* ]]; then
         sed -i 's|net.ipv4.tcp_timestamps.*|net.ipv4.tcp_timestamps=0|g' /etc/sysctl.conf
     fi
     /sbin/sysctl -p
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function mesh_firewall {
 }
 
 function firewall_drop_spoofed_packets {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     iptables -t mangle -A PREROUTING -s 224.0.0.0/3 -j DROP
     iptables -t mangle -A PREROUTING -s 127.0.0.0/8 ! -i lo -j DROP
     function_check save_firewall_settings
     save_firewall_settings
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function firewall_rate_limits {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
 
     function_check save_firewall_settings
     save_firewall_settings
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-utils-git

 }
 
 function configure_firewall_for_git {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
     fi
 
     firewall_add Git 9418 tcp
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-utils-go

         systemctl restart gogs
     fi
 
-    set_completion_param "$FUNCNAME" "$GO_VERSION"
+    set_completion_param "${FUNCNAME[0]}" "$GO_VERSION"
 }
 
 # NOTE: deliberately there is no "exit 0"

src/freedombone-utils-international

 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 function locale_setup {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     update-locale LC_ALL=${DEFAULT_LANGUAGE}
     update-locale LC_CTYPE=${DEFAULT_LANGUAGE}
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-utils-login

 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 function change_login_message {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     echo "'    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'" >> /etc/motd
     echo $'                  Freedom in the Cloud' >> /etc/motd
     echo '' >> /etc/motd
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-utils-mongodb

         exit 7356272
     fi
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
         fi
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function remove_mongodb {

src/freedombone-utils-monkeysphere

 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 function install_monkeysphere {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     apt-get -yq install monkeysphere msva-perl
     fpr=$(gpg --with-colons --fingerprint $MY_GPG_PUBLIC_KEY_ID | grep fpr | head -n 1 | awk -F ':' '{print $10}')
     monkeysphere-authentication add-identity-certifier $fpr
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-utils-network

 MESH_INSTALL_DIR=/var/lib
 
 function install_static_network {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $INSTALLING_ON_BBB == "yes" ]]; then
     echo '    netmask 255.255.255.0' >> /etc/network/interfaces.d/static
     echo "    gateway $ROUTER_IP_ADDRESS" >> /etc/network/interfaces.d/static
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function get_external_ipv4_address {

src/freedombone-utils-nodejs

         mesh_install_nodejs
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         upgrade_nodejs
         return
     fi
         fi
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately there is no "exit 0"

src/freedombone-utils-onion

     if [[ $SYSTEM_TYPE == "mesh"* ]]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     apt-get -yq install tor connect-proxy
         echo 'Host *.onion' >> /etc/skel/.ssh/config
         echo 'ProxyCommand connect -R remote -5 -S 127.0.0.1:9050 %h %p' >> /etc/skel/.ssh/config
     fi
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function configure_ssh_onion {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $SYSTEM_TYPE == "mesh"* ]]; then
     set_completion_param "ssh onion domain" "${SSH_ONION_HOSTNAME}"
     add_email_hostname "${SSH_ONION_HOSTNAME}"
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function install_tor {
     if [[ $SYSTEM_TYPE == "mesh*" ]]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     sed -i "s|#AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes|g" /etc/tor/torrc
     sed -i "s|AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes|g" /etc/tor/torrc
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function resolve_dns_via_tor {
     if [[ $SYSTEM_TYPE == "mesh"* ]]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [ ! -f /etc/tor/torrc ]; then
     echo 'nameserver 127.0.0.1:53' > $resolvconf
     resolvconf -u
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # see https://trac.torproject.org/projects/tor/wiki/doc/TransparentProxy
 # Local Redirection and Anonymizing Middlebox
 function route_outgoing_traffic_through_tor {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $ROUTE_THROUGH_TOR != "yes" ]]; then
         echo "DNSListenAddress $LOCAL_NETWORK_STATIC_IP_ADDRESS" >> /etc/tor/torrc
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function get_app_onion_address {

src/freedombone-utils-passwords

 
 function enforce_good_passwords {
     # because humans are generally bad at choosing passwords
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     apt-get -yq install libpam-cracklib
 
     sed -i 's/password.*requisite.*pam_cracklib.so.*/password        required                       pam_cracklib.so retry=2 dcredit=-4 ucredit=-1 ocredit=-1 lcredit=0 minlen=10 reject_username/g' /etc/pam.d/common-password
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function create_password {

src/freedombone-utils-postgresql

         return
     fi
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
         exit 835290
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function add_postgresql_user {

src/freedombone-utils-repos

 DEBIAN_REPO="ftp.us.debian.org"
 
 function create_repo_sources {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     rm -rf /var/lib/apt/lists/*
     apt-get update
     apt-get -yq install apt-transport-https
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # A command to create a git repository for a project
 function create_git_project {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     apt-get -yq install git
     echo 'exit 0' >> /usr/bin/$CREATE_GIT_PROJECT_COMMAND
     chmod +x /usr/bin/$CREATE_GIT_PROJECT_COMMAND
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-utils-rng

 }
 
 function check_onerng_verification {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $HWRNG_TYPE != "onerng" ]]; then
     echo $'OneRNG firmware verification passed'
     # if haveged was previously installed then remove it
     apt-get -yq remove haveged
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function install_onerng {
 }
 
 function random_number_generator {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
             ;;
     esac
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-utils-setup

 }
 
 function initial_setup {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
         mkdir -p $INSTALL_DIR
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function turn_off_magic_sysrq {
 function search_for_attached_usb_drive {
     # If a USB drive is attached then search for email,
     # gpg, ssh keys and emacs configuration
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     detect_usb_drive
         fi
         echo $'No USB drive attached'
     fi
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function mark_admin_user_account {
     if [[ $SYSTEM_TYPE == "mesh"* ]]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     echo "ACTION==\"add\", KERNEL==\"sd*[!0-9]\", RUN+=\"/usr/local/bin/${PROJECT_NAME}-usb-canary\"" > /etc/udev/rules.d/00-usb-canary.rules
     udevadm control --reload-rules
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function setup_firewall {

src/freedombone-utils-ssh

 SSH_HOST_KEY_ALGORITHMS="ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-rsa-cert-v00@openssh.com,ssh-ed25519,ssh-rsa"
 
 function configure_ssh {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
 
     function_check configure_firewall_for_ssh
     configure_firewall_for_ssh
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # see https://stribika.github.io/2015/01/04/secure-secure-shell.html
 }
 
 function configure_ssh_client {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     #sed -i 's/#   PasswordAuthentication.*/   PasswordAuthentication no/g' /etc/ssh/ssh_config
 
     function_check ssh_remove_small_moduli
     ssh_remove_small_moduli
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function regenerate_ssh_keys {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     rm -f /etc/ssh/ssh_host_*
     ssh_remove_small_moduli
 
     systemctl restart ssh
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function configure_firewall_for_ssh {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
     fi
 
     firewall_add SSH ${SSH_PORT} tcp
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function get_ssh_server_key {

src/freedombone-utils-tracker

         return
     fi
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     systemctl enable tracker.service
     systemctl start tracker.service
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-utils-upgrade

         fi
     fi
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     apt-get -yq install unattended-upgrades
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function upgrade_installation_from_previous_versions {
     if [ ! -f $COMPLETION_FILE ]; then
         return
     fi
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
         rm /usr/local/bin/zeronetavahi
     fi
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-utils-watchdog

 WATCHDOG_SCRIPT_NAME="keepon"
 
 function install_watchdog_script {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     echo '#!/bin/bash' > /usr/bin/$WATCHDOG_SCRIPT_NAME
     function_check cron_add_mins
     cron_add_mins 1 "/usr/bin/$WATCHDOG_SCRIPT_NAME"
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function daemon_is_running {

src/freedombone-utils-web

     function_check set_repo_commit
     set_repo_commit $INSTALL_DIR/inadyn "inadyn commit" "$INADYN_COMMIT" $INADYN_REPO
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
     systemctl start inadyn
     systemctl daemon-reload
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function update_default_search_engine {
 }
 
 function install_command_line_browser {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     apt-get -yq install elinks
     update_default_search_engine
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function mesh_web_server {
     function_check set_repo_commit
     set_repo_commit $INSTALL_DIR/nginx_ensite "nginx-ensite commit" "$NGINX_ENSITE_COMMIT" $NGINX_ENSITE_REPO
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     # remove apache
     function_check configure_firewall_for_web_access
     configure_firewall_for_web_access
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function remove_certs {
 }
 
 function configure_firewall_for_web_access {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
     fi
     firewall_add HTTP 80 tcp
     firewall_add HTTPS 443 tcp
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function update_default_domain {

src/freedombone-utils-wifi

         return
     fi
 
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
 
     if [ -f $WIFI_NETWORKS_FILE ]; then
         ${PROJECT_NAME}-wifi --networks $WIFI_NETWORKS_FILE
-        mark_completed $FUNCNAME
+        mark_complete "${FUNCNAME[0]}"
         return
     fi
 
     else
         ${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
     fi
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # ath9k_htc driver
 function install_atheros_wifi {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
     if [ $INSTALLING_ON_BBB != "yes" ]; then
     if [ ! "$?" = "0" ]; then
         exit 74681
     fi
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 function update_wifi_adaptors {

src/freedombone-utils-zram

 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 function enable_zram {
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
         return
     fi
 
 
     ${PROJECT_NAME}-zram on
 
-    mark_completed $FUNCNAME
+    mark_completed "${FUNCNAME[0]}"
 }
 
 # NOTE: deliberately no exit 0

src/freedombone-zram

       echo "ExecStart=${PROJECT_NAME}-zram on";
       echo '';
       echo '[Install]';
-      echo 'WantedBy=multi-user.target'; } >> $DAEMON_FILENAME
+      echo 'WantedBy=multi-user.target'; } > $DAEMON_FILENAME
 }
 
 function zram_on {