Merge pull request #444 from ejsears/merge-script-into-dev-from-main

Merge script into dev from main

Author: jimmyjon711

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}"
 }
 
 clone_and_maybe_restart() {

install-afc.sh

@@ -10,31 +10,33 @@ 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
+source include/utils.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
 
 original_args=("$@")
 
 main() {
   ###################### Main script logic below ######################
 
-  while getopts "a:k:s:m:n:b:p:y:u:th" arg; do
+  while getopts "a:k:s:m:n:b:p:y:th" arg; do
     case ${arg} in
     a) moonraker_address=${OPTARG} ;;
     k) klipper_dir=${OPTARG} ;;
@@ -52,6 +54,13 @@ main() {
   done
 
   moonraker="${moonraker_address}:${moonraker_port}"
+  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"
+
+
   # Make sure necessary directories exist
   echo "Ensuring we are not running as root.."
   check_root