Refactor install script to improve variable handling and ensure directory creation (#417)

* Updated `afc_config_dir` in `include/constants.sh` to use curly braces for variable expansion, ensuring consistency and avoiding potential parsing issues.
* Modified the `copy_config` function in `include/utils.sh` to copy only the contents of the source directory (`config/*`) instead of the directory itself, preventing redundant directory nesting.

Author: ejsears

include/constants.sh

@@ -10,7 +10,7 @@
 printer_config_dir="$HOME/printer_data/config"
 klipper_dir="$HOME/klipper"
 afc_path="$HOME/AFC-Klipper-Add-On"
-afc_config_dir="$printer_config_dir/AFC"
+afc_config_dir="${printer_config_dir}/AFC"
 afc_file="$afc_config_dir/AFC.cfg"
 moonraker_config_file="$printer_config_dir/moonraker.conf"
 klipper_venv="$HOME/klippy-env/bin"

include/utils.sh

@@ -32,10 +32,8 @@ function show_help() {
 }
 
 function copy_config() {
-  if [ -d "${afc_config_dir}" ]; then
-    mkdir -p "${afc_config_dir}"
-  fi
-  cp -R "${afc_path}/config" "${afc_config_dir}"
+  mkdir -p "${afc_config_dir}"
+  cp -R ${afc_path}/config/* "${afc_config_dir}"
 }
 
 function clone_repo() {

install-afc.sh

@@ -10,45 +10,53 @@ export LC_ALL=C
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
+source include/constants.sh
+
 # Menu functions
 source include/menus/main_menu.sh
 source include/menus/install_menu.sh
 source include/menus/update_menu.sh
 source include/menus/utilities_menu.sh
 source include/menus/additional_system_menu.sh
 
-# Install / Update functions
-source include/buffer_configurations.sh
-source include/check_commands.sh
-source include/colors.sh
-source include/constants.sh
-source include/install_functions.sh
-source include/uninstall.sh
-source include/update_commands.sh
-source include/update_functions.sh
-source include/utils.sh
-source include/unit_functions.sh
 
 ###################### Main script logic below ######################
 
 while getopts "a:k:s:m:n:b:p:y:u:th" arg; do
   case ${arg} in
-  a) moonraker_address=${OPTARG} ;;
-  k) klipper_dir=${OPTARG} ;;
-  m) moonraker_config_file=${OPTARG} ;;
-  n) moonraker_port=${OPTARG} ;;
-  s) klipper_service=${OPTARG} ;;
-  b) branch=${OPTARG} ;;
-  p) printer_config_dir=${OPTARG} ;;
-  y) klipper_venv=${OPTARG} ;;
-  t) test_mode=True ;;
+  a) export moonraker_address=${OPTARG} ;;
+  k) export klipper_dir=${OPTARG} ;;
+  m) export moonraker_config_file=${OPTARG} ;;
+  n) export moonraker_port=${OPTARG} ;;
+  s) export klipper_service=${OPTARG} ;;
+  b) export branch=${OPTARG} ;;
+  p) export printer_config_dir=${OPTARG} ;;
+  y) export klipper_venv=${OPTARG} ;;
+  t) export test_mode=True ;;
   h) show_help
     exit 0 ;;
   *) exit 1 ;;
   esac
 done
 
 moonraker="${moonraker_address}:${moonraker_port}"
+afc_config_dir="${printer_config_dir}/AFC"
+afc_file="${afc_config_dir}/AFC.cfg"
+moonraker_config_file="${printer_config_dir}/moonraker.conf"
+afc_path="$HOME/AFC-Klipper-Add-On"
+
+# Install / Update functions
+source include/buffer_configurations.sh
+source include/check_commands.sh
+source include/colors.sh
+source include/install_functions.sh
+source include/uninstall.sh
+source include/update_commands.sh
+source include/update_functions.sh
+source include/utils.sh
+source include/unit_functions.sh
+
+
 # Make sure necessary directories exist
 echo "Ensuring we are not running as root.."
 check_root