From 77a768026beafe76dd352aa3d7b1e439bfc13df8 Mon Sep 17 00:00:00 2001 From: Yifei Ding Date: Fri, 12 Nov 2021 15:27:23 -0800 Subject: [PATCH] refactor: SYSTEMDDIR -> SYSTEMD_DIR --- scripts/constants/constants.sh | 2 +- .../install-debian.sh | 2 +- scripts/functions.sh | 18 +++++++-------- scripts/install_dwc2.sh | 4 ++-- scripts/install_klipper.sh | 4 ++-- scripts/install_mjpg-streamer.sh | 2 +- scripts/install_moonraker.sh | 8 +++---- scripts/install_octoprint.sh | 4 ++-- scripts/remove.sh | 22 +++++++++---------- scripts/update.sh | 2 +- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/scripts/constants/constants.sh b/scripts/constants/constants.sh index 74cc45e..05790b6 100755 --- a/scripts/constants/constants.sh +++ b/scripts/constants/constants.sh @@ -31,7 +31,7 @@ readonly MOONRAKER_TELEGRAM_BOT_ENV_DIR=${HOME}/moonraker-telegram-bot-env #misc readonly INI_FILE=${HOME}/.kiauh.ini readonly BACKUP_DIR=${HOME}/kiauh-backups -readonly SYSTEMDDIR=/etc/systemd/system +readonly SYSTEMD_DIR=/etc/systemd/system ### set github repos readonly KLIPPER_REPO=https://github.com/Klipper3d/klipper.git diff --git a/scripts/dwc2-for-klipper-socket-installer/install-debian.sh b/scripts/dwc2-for-klipper-socket-installer/install-debian.sh index e71385e..b608cf2 100755 --- a/scripts/dwc2-for-klipper-socket-installer/install-debian.sh +++ b/scripts/dwc2-for-klipper-socket-installer/install-debian.sh @@ -48,7 +48,7 @@ create_virtualenv() # Step 4: Install startup script install_script(){ report_status "Installing system start script..." - sudo /bin/sh -c "cat > $SYSTEMDDIR/dwc.service" << EOF + sudo /bin/sh -c "cat > $SYSTEMD_DIR/dwc.service" << EOF #Systemd service file for DWC [Unit] Description=dwc_webif diff --git a/scripts/functions.sh b/scripts/functions.sh index 1a780f5..64fee5a 100755 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -93,33 +93,33 @@ set_klipper_cfg_path(){ fi ### handle single klipper instance service file - if [ -f $SYSTEMDDIR/klipper.service ]; then + if [ -f $SYSTEMD_DIR/klipper.service ]; then status_msg "Configuring Klipper for new path ..." - sudo sed -i -r "/ExecStart=/ s| (.+)\/printer.cfg| $new_klipper_cfg_loc/printer.cfg|" $SYSTEMDDIR/klipper.service + sudo sed -i -r "/ExecStart=/ s| (.+)\/printer.cfg| $new_klipper_cfg_loc/printer.cfg|" $SYSTEMD_DIR/klipper.service ok_msg "OK!" fi ### handle multi klipper instance service file - if ls $SYSTEMDDIR/klipper-*.service 2>/dev/null 1>&2; then + if ls $SYSTEMD_DIR/klipper-*.service 2>/dev/null 1>&2; then status_msg "Configuring Klipper for new path ..." - for service in $(find $SYSTEMDDIR/klipper-*.service); do + for service in $(find $SYSTEMD_DIR/klipper-*.service); do sudo sed -i -r "/ExecStart=/ s| (.+)\/printer_| $new_klipper_cfg_loc/printer_|" $service done ok_msg "OK!" fi ### handle single moonraker instance service and moonraker.conf file - if [ -f $SYSTEMDDIR/moonraker.service ]; then + if [ -f $SYSTEMD_DIR/moonraker.service ]; then status_msg "Configuring Moonraker for new path ..." - sudo sed -i -r "/ExecStart=/ s|-c (.+)\/moonraker\.conf|-c $new_klipper_cfg_loc/moonraker.conf|" $SYSTEMDDIR/moonraker.service + sudo sed -i -r "/ExecStart=/ s|-c (.+)\/moonraker\.conf|-c $new_klipper_cfg_loc/moonraker.conf|" $SYSTEMD_DIR/moonraker.service ### replace old file path with new one in moonraker.conf sed -i -r "/config_path:/ s|config_path:.*|config_path: $new_klipper_cfg_loc|" $new_klipper_cfg_loc/moonraker.conf ok_msg "OK!" fi ### handle multi moonraker instance service file - if ls $SYSTEMDDIR/moonraker-*.service 2>/dev/null 1>&2; then + if ls $SYSTEMD_DIR/moonraker-*.service 2>/dev/null 1>&2; then status_msg "Configuring Moonraker for new path ..." - for service in $(find $SYSTEMDDIR/moonraker-*.service); do + for service in $(find $SYSTEMD_DIR/moonraker-*.service); do sudo sed -i -r "/ExecStart=/ s|-c (.+)\/printer_|-c $new_klipper_cfg_loc/printer_|" $service done ### replace old file path with new one in moonraker.conf @@ -144,7 +144,7 @@ source_kiauh_ini(){ do_action_service(){ shopt -s extglob # enable extended globbing - SERVICES="$SYSTEMDDIR/$2?(-*([0-9])).service" + SERVICES="$SYSTEMD_DIR/$2?(-*([0-9])).service" ### set a variable for the ok and status messages [ "$1" == "start" ] && ACTION1="started" && ACTION2="Starting" [ "$1" == "stop" ] && ACTION1="stopped" && ACTION2="Stopping" diff --git a/scripts/install_dwc2.sh b/scripts/install_dwc2.sh index 65223ce..ea289f6 100755 --- a/scripts/install_dwc2.sh +++ b/scripts/install_dwc2.sh @@ -193,7 +193,7 @@ create_dwc_virtualenv() create_single_dwc_startscript(){ ### create systemd service file - sudo /bin/sh -c "cat > ${SYSTEMDDIR}/dwc.service" << DWC + sudo /bin/sh -c "cat > ${SYSTEMD_DIR}/dwc.service" << DWC [Unit] Description=DuetWebControl After=network.target @@ -211,7 +211,7 @@ DWC create_multi_dwc_startscript(){ ### create systemd service file - sudo /bin/sh -c "cat > ${SYSTEMDDIR}/dwc-$INSTANCE.service" << DWC + sudo /bin/sh -c "cat > ${SYSTEMD_DIR}/dwc-$INSTANCE.service" << DWC [Unit] Description=DuetWebControl After=network.target diff --git a/scripts/install_klipper.sh b/scripts/install_klipper.sh index 664f6dd..c9ce73b 100755 --- a/scripts/install_klipper.sh +++ b/scripts/install_klipper.sh @@ -120,7 +120,7 @@ create_klipper_service(){ P_CFG="$CFG_PATH/printer.cfg" P_CFG_SRC="${SRCDIR}/kiauh/resources/printer.cfg" KL_SERV_SRC="${SRCDIR}/kiauh/resources/klipper.service" - KL_SERV_TARGET="$SYSTEMDDIR/klipper.service" + KL_SERV_TARGET="$SYSTEMD_DIR/klipper.service" write_kl_service(){ [ ! -d $CFG_PATH ] && mkdir -p $CFG_PATH @@ -155,7 +155,7 @@ create_klipper_service(){ while [ $i -le $INSTANCE_COUNT ]; do ### rewrite default variables for multi instance cases CFG_PATH="$klipper_cfg_loc/printer_$i" - KL_SERV_TARGET="$SYSTEMDDIR/klipper-$i.service" + KL_SERV_TARGET="$SYSTEMD_DIR/klipper-$i.service" P_TMP="/tmp/printer-$i" P_CFG="$CFG_PATH/printer.cfg" KL_LOG="${HOME}/klipper_logs/klippy-$i.log" diff --git a/scripts/install_mjpg-streamer.sh b/scripts/install_mjpg-streamer.sh index 5390f9b..25fbed1 100755 --- a/scripts/install_mjpg-streamer.sh +++ b/scripts/install_mjpg-streamer.sh @@ -8,7 +8,7 @@ install_mjpg-streamer(){ ### set default values MJPG_SERV_SRC="${SRCDIR}/kiauh/resources/webcamd.service" - MJPG_SERV_TARGET="$SYSTEMDDIR/webcamd.service" + MJPG_SERV_TARGET="$SYSTEMD_DIR/webcamd.service" WEBCAM_TXT="$klipper_cfg_loc/webcam.txt" ### if there is a webcamd.service -> exit diff --git a/scripts/install_moonraker.sh b/scripts/install_moonraker.sh index a96c346..24efd66 100755 --- a/scripts/install_moonraker.sh +++ b/scripts/install_moonraker.sh @@ -31,13 +31,13 @@ moonraker_setup_dialog(){ shopt -s extglob # enable extended globbing ### check for existing moonraker service installations - FILE="$SYSTEMDDIR/moonraker?(-*([0-9])).service" + FILE="$SYSTEMD_DIR/moonraker?(-*([0-9])).service" if ls $FILE 2>/dev/null 1>&2; then ERROR_MSG="At least one Moonraker service is already installed!" && return 0 fi ### check for existing klipper service installations - FILE="$SYSTEMDDIR/klipper?(-*([0-9])).service" + FILE="$SYSTEMD_DIR/klipper?(-*([0-9])).service" if ! ls $FILE 2>/dev/null 1>&2; then ERROR_MSG="Klipper service not found, please install Klipper first!" && return 0 fi @@ -167,7 +167,7 @@ create_moonraker_service(){ MR_LOG="${HOME}/klipper_logs/moonraker.log" MR_CONF="$CFG_PATH/moonraker.conf" MR_SERV_SRC="${SRCDIR}/kiauh/resources/moonraker.service" - MR_SERV_TARGET="$SYSTEMDDIR/moonraker.service" + MR_SERV_TARGET="$SYSTEMD_DIR/moonraker.service" write_mr_service(){ if [ ! -f $MR_SERV_TARGET ]; then @@ -196,7 +196,7 @@ create_moonraker_service(){ while [ $i -le $INSTANCE_COUNT ]; do ### rewrite default variables for multi instance cases CFG_PATH="$klipper_cfg_loc/printer_$i" - MR_SERV_TARGET="$SYSTEMDDIR/moonraker-$i.service" + MR_SERV_TARGET="$SYSTEMD_DIR/moonraker-$i.service" MR_CONF="$CFG_PATH/moonraker.conf" MR_LOG="${HOME}/klipper_logs/moonraker-$i.log" ### write multi instance service diff --git a/scripts/install_octoprint.sh b/scripts/install_octoprint.sh index da89a47..488e3b9 100755 --- a/scripts/install_octoprint.sh +++ b/scripts/install_octoprint.sh @@ -102,7 +102,7 @@ add_to_groups(){ create_single_octoprint_startscript(){ ### create single instance systemd service file -sudo /bin/sh -c "cat > ${SYSTEMDDIR}/octoprint.service" << OCTOPRINT +sudo /bin/sh -c "cat > ${SYSTEMD_DIR}/octoprint.service" << OCTOPRINT [Unit] Description=Starts OctoPrint on startup After=network-online.target @@ -122,7 +122,7 @@ OCTOPRINT create_multi_octoprint_startscript(){ ### create multi instance systemd service file -sudo /bin/sh -c "cat > ${SYSTEMDDIR}/octoprint-$INSTANCE.service" << OCTOPRINT +sudo /bin/sh -c "cat > ${SYSTEMD_DIR}/octoprint-$INSTANCE.service" << OCTOPRINT [Unit] Description=Starts OctoPrint instance $INSTANCE on startup After=network-online.target diff --git a/scripts/remove.sh b/scripts/remove.sh index 1da6409..0055b89 100755 --- a/scripts/remove.sh +++ b/scripts/remove.sh @@ -2,7 +2,7 @@ remove_klipper(){ shopt -s extglob # enable extended globbing ### ask the user if he wants to uninstall moonraker too. ###? currently usefull if the user wants to switch from single-instance to multi-instance - FILE="$SYSTEMDDIR/moonraker?(-*([0-9])).service" + FILE="$SYSTEMD_DIR/moonraker?(-*([0-9])).service" if ls $FILE 2>/dev/null 1>&2; then while true; do unset REM_MR @@ -44,7 +44,7 @@ remove_klipper(){ fi ### remove all klipper services - FILE="$SYSTEMDDIR/klipper?(-*([0-9])).service" + FILE="$SYSTEMD_DIR/klipper?(-*([0-9])).service" if ls $FILE 2>/dev/null 1>&2; then status_msg "Removing Klipper Services ..." for service in $(ls $FILE | cut -d"/" -f5) @@ -52,7 +52,7 @@ remove_klipper(){ status_msg "Removing $service ..." sudo systemctl stop $service sudo systemctl disable $service - sudo rm -f $SYSTEMDDIR/$service + sudo rm -f $SYSTEMD_DIR/$service ok_msg "Done!" done ### reloading units @@ -125,7 +125,7 @@ remove_moonraker(){ fi ### remove all moonraker services - FILE="$SYSTEMDDIR/moonraker?(-*([0-9])).service" + FILE="$SYSTEMD_DIR/moonraker?(-*([0-9])).service" if ls $FILE 2>/dev/null 1>&2; then status_msg "Removing Moonraker Services ..." for service in $(ls $FILE | cut -d"/" -f5) @@ -133,7 +133,7 @@ remove_moonraker(){ status_msg "Removing $service ..." sudo systemctl stop $service sudo systemctl disable $service - sudo rm -f $SYSTEMDDIR/$service + sudo rm -f $SYSTEMD_DIR/$service ok_msg "Done!" done ### reloading units @@ -204,7 +204,7 @@ remove_dwc2(){ status_msg "Removing $service ..." sudo systemctl stop $service sudo systemctl disable $service - sudo rm -f $SYSTEMDDIR/$service + sudo rm -f $SYSTEMD_DIR/$service ok_msg "Done!" done ### reloading units @@ -324,7 +324,7 @@ remove_octoprint(){ status_msg "Removing $service ..." sudo systemctl stop $service sudo systemctl disable $service - sudo rm -f $SYSTEMDDIR/$service + sudo rm -f $SYSTEMD_DIR/$service ok_msg "OctoPrint Service removed!" done ### reloading units @@ -396,7 +396,7 @@ remove_klipperscreen(){ status_msg "Removing KlipperScreen service ..." sudo systemctl stop KlipperScreen sudo systemctl disable moonraker - sudo rm -f $SYSTEMDDIR/KlipperScreen.service + sudo rm -f $SYSTEMD_DIR/KlipperScreen.service ###reloading units sudo systemctl daemon-reload sudo systemctl reset-failed @@ -439,7 +439,7 @@ remove_MoonrakerTelegramBot(){ status_msg "Removing MoonrakerTelegramBot service ..." sudo systemctl stop moonraker-telegram-bot sudo systemctl disable moonraker-telegram-bot - sudo rm -f $SYSTEMDDIR/moonraker-telegram-bot.service + sudo rm -f $SYSTEMD_DIR/moonraker-telegram-bot.service ###reloading units sudo systemctl daemon-reload sudo systemctl reset-failed @@ -464,10 +464,10 @@ remove_MoonrakerTelegramBot(){ remove_mjpg-streamer(){ ### remove MJPG-Streamer service - if [ -e $SYSTEMDDIR/webcamd.service ]; then + if [ -e $SYSTEMD_DIR/webcamd.service ]; then status_msg "Removing MJPG-Streamer service ..." sudo systemctl stop webcamd && sudo systemctl disable webcamd - sudo rm -f $SYSTEMDDIR/webcamd.service + sudo rm -f $SYSTEMD_DIR/webcamd.service ###reloading units sudo systemctl daemon-reload sudo systemctl reset-failed diff --git a/scripts/update.sh b/scripts/update.sh index 8a453b3..3222912 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -75,7 +75,7 @@ update_log_paths(){ source_kiauh_ini LPATH="${HOME}/klipper_logs" [ ! -d "$LPATH" ] && mkdir -p "$LPATH" - FILE="$SYSTEMDDIR/$1?(-*([0-9])).service" + FILE="$SYSTEMD_DIR/$1?(-*([0-9])).service" for file in $(ls $FILE); do [ "$1" == "klipper" ] && LOG="klippy" [ "$1" == "moonraker" ] && LOG="moonraker"