fix path var in mosquitto.conf copy command

also corrected a couple of minor items reported by checkshell
This commit is contained in:
Matthew R Kasun 2023-04-12 15:44:52 -04:00
parent 9390c0652a
commit 0c45e38939

View file

@ -22,7 +22,7 @@ backup_v17_files() {
mkdir $INSTALL_PATH/netmaker_0.17.1_backup mkdir $INSTALL_PATH/netmaker_0.17.1_backup
cp $INSTALL_PATH/docker-compose.yml $INSTALL_PATH/netmaker_0.17.1_backup/docker-compose.yml cp $INSTALL_PATH/docker-compose.yml $INSTALL_PATH/netmaker_0.17.1_backup/docker-compose.yml
cp $INSTALL_PATH/Caddyfile $INSTALL_PATH/netmaker_0.17.1_backup/Caddyfile cp $INSTALL_PATH/Caddyfile $INSTALL_PATH/netmaker_0.17.1_backup/Caddyfile
cp $INSTALL_PATH/mosquitto.conf %INSTALL_PATH/netmaker_0.17.1_backup/mosquitto.conf cp $INSTALL_PATH/mosquitto.conf $INSTALL_PATH/netmaker_0.17.1_backup/mosquitto.conf
cp $INSTALL_PATH/wait.sh $INSTALL_PATH/netmaker_0.17.1_backup/wait.sh cp $INSTALL_PATH/wait.sh $INSTALL_PATH/netmaker_0.17.1_backup/wait.sh
} }
@ -38,7 +38,7 @@ backup_volumes() {
restore_old_netmaker_instructions() { restore_old_netmaker_instructions() {
echo "There was a problem with the installation. Your config files and volumes have been backed up." echo "There was a problem with the installation. Your config files and volumes have been backed up."
echo "To restore Netmaker back to v0.17.1, copy all the netmaker volume backups (caddy_conf-backup, caddy_data-backup, dnsconfig-backup, mosquitto_data-backup, mosquitto_logs-backup, and sqldata-backup) back to their regular names with out the -backup." echo "To restore Netmaker back to v0.17.1, copy all the netmaker volume backups (caddy_conf-backup, caddy_data-backup, dnsconfig-backup, mosquitto_data-backup, mosquitto_logs-backup, and sqldata-backup) back to their regular names with out the -backup."
echo "Your config files should be located in ${INSALL_PATH}/netmaker_0.17.1_backup. Simply run cp ${INSALL_PATH}/netmaker_0.17.1_backup/* . (include the .) and run docker-compose up -d." echo "Your config files should be located in ${INSTALL_PATH}/netmaker_0.17.1_backup. Simply run cp ${INSTALL_PATH}/netmaker_0.17.1_backup/* . (include the .) and run docker-compose up -d."
echo "Your netmaker should be back to v0.17.1" echo "Your netmaker should be back to v0.17.1"
} }
@ -119,7 +119,7 @@ install_dependencies() {
echo "version: $(docker version)" echo "version: $(docker version)"
else else
echo "Docker not found. adding to dependencies" echo "Docker not found. adding to dependencies"
$dependencies += " docker.io" dependencies+=" docker.io"
fi fi
${update_cmd} ${update_cmd}