h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

refactor: SYSTEMDDIR -> SYSTEMD_DIR

Browse Source
This commit is contained in:
Yifei Ding
2021-11-12 15:27:23 -08:00
parent de23b41759
commit 77a768026b
10 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/constants/constants.sh
View File

@@ -31,7 +31,7 @@ readonly MOONRAKER_TELEGRAM_BOT_ENV_DIR=${HOME}/moonraker-telegram-bot-env
#misc #misc
readonly INI_FILE=${HOME}/.kiauh.ini readonly INI_FILE=${HOME}/.kiauh.ini
readonly BACKUP_DIR=${HOME}/kiauh-backups readonly BACKUP_DIR=${HOME}/kiauh-backups
readonly SYSTEMDDIR=/etc/systemd/system readonly SYSTEMD_DIR=/etc/systemd/system
### set github repos ### set github repos
readonly KLIPPER_REPO=https://github.com/Klipper3d/klipper.git readonly KLIPPER_REPO=https://github.com/Klipper3d/klipper.git

2
scripts/dwc2-for-klipper-socket-installer/install-debian.sh
View File

@@ -48,7 +48,7 @@ create_virtualenv()
# Step 4: Install startup script # Step 4: Install startup script
install_script(){ install_script(){
report_status "Installing system start 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 #Systemd service file for DWC
[Unit] [Unit]
Description=dwc_webif Description=dwc_webif

18
scripts/functions.sh
View File

@@ -93,33 +93,33 @@ set_klipper_cfg_path(){
fi fi
### handle single klipper instance service file ### 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 ..." 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!" ok_msg "OK!"
fi fi
### handle multi klipper instance service file ### 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 ..." 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 sudo sed -i -r "/ExecStart=/ s| (.+)\/printer_| $new_klipper_cfg_loc/printer_|" $service
done done
ok_msg "OK!" ok_msg "OK!"
fi fi
### handle single moonraker instance service and moonraker.conf file ### 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 ..." 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 ### 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 sed -i -r "/config_path:/ s|config_path:.*|config_path: $new_klipper_cfg_loc|" $new_klipper_cfg_loc/moonraker.conf
ok_msg "OK!" ok_msg "OK!"
fi fi
### handle multi moonraker instance service file ### 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 ..." 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 sudo sed -i -r "/ExecStart=/ s|-c (.+)\/printer_|-c $new_klipper_cfg_loc/printer_|" $service
done done
### replace old file path with new one in moonraker.conf ### replace old file path with new one in moonraker.conf
@@ -144,7 +144,7 @@ source_kiauh_ini(){
do_action_service(){ do_action_service(){
shopt -s extglob # enable extended globbing 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 ### set a variable for the ok and status messages
[ "$1" == "start" ] && ACTION1="started" && ACTION2="Starting" [ "$1" == "start" ] && ACTION1="started" && ACTION2="Starting"
[ "$1" == "stop" ] && ACTION1="stopped" && ACTION2="Stopping" [ "$1" == "stop" ] && ACTION1="stopped" && ACTION2="Stopping"

4
scripts/install_dwc2.sh
View File

@@ -193,7 +193,7 @@ create_dwc_virtualenv()
create_single_dwc_startscript(){ create_single_dwc_startscript(){
### create systemd service file ### create systemd service file
sudo /bin/sh -c "cat > ${SYSTEMDDIR}/dwc.service" << DWC sudo /bin/sh -c "cat > ${SYSTEMD_DIR}/dwc.service" << DWC
[Unit] [Unit]
Description=DuetWebControl Description=DuetWebControl
After=network.target After=network.target
@@ -211,7 +211,7 @@ DWC
create_multi_dwc_startscript(){ create_multi_dwc_startscript(){
### create systemd service file ### 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] [Unit]
Description=DuetWebControl Description=DuetWebControl
After=network.target After=network.target

4
scripts/install_klipper.sh
View File

@@ -120,7 +120,7 @@ create_klipper_service(){
P_CFG="$CFG_PATH/printer.cfg" P_CFG="$CFG_PATH/printer.cfg"
P_CFG_SRC="${SRCDIR}/kiauh/resources/printer.cfg" P_CFG_SRC="${SRCDIR}/kiauh/resources/printer.cfg"
KL_SERV_SRC="${SRCDIR}/kiauh/resources/klipper.service" KL_SERV_SRC="${SRCDIR}/kiauh/resources/klipper.service"
KL_SERV_TARGET="$SYSTEMDDIR/klipper.service" KL_SERV_TARGET="$SYSTEMD_DIR/klipper.service"
write_kl_service(){ write_kl_service(){
[ ! -d $CFG_PATH ] && mkdir -p $CFG_PATH [ ! -d $CFG_PATH ] && mkdir -p $CFG_PATH
@@ -155,7 +155,7 @@ create_klipper_service(){
while [ $i -le $INSTANCE_COUNT ]; do while [ $i -le $INSTANCE_COUNT ]; do
### rewrite default variables for multi instance cases ### rewrite default variables for multi instance cases
CFG_PATH="$klipper_cfg_loc/printer_$i" 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_TMP="/tmp/printer-$i"
P_CFG="$CFG_PATH/printer.cfg" P_CFG="$CFG_PATH/printer.cfg"
KL_LOG="${HOME}/klipper_logs/klippy-$i.log" KL_LOG="${HOME}/klipper_logs/klippy-$i.log"

2
scripts/install_mjpg-streamer.sh
View File

@@ -8,7 +8,7 @@ install_mjpg-streamer(){
### set default values ### set default values
MJPG_SERV_SRC="${SRCDIR}/kiauh/resources/webcamd.service" 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" WEBCAM_TXT="$klipper_cfg_loc/webcam.txt"
### if there is a webcamd.service -> exit ### if there is a webcamd.service -> exit

8
scripts/install_moonraker.sh
View File

@@ -31,13 +31,13 @@ moonraker_setup_dialog(){
shopt -s extglob # enable extended globbing shopt -s extglob # enable extended globbing
### check for existing moonraker service installations ### 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 if ls $FILE 2>/dev/null 1>&2; then
ERROR_MSG="At least one Moonraker service is already installed!" && return 0 ERROR_MSG="At least one Moonraker service is already installed!" && return 0
fi fi
### check for existing klipper service installations ### 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 if ! ls $FILE 2>/dev/null 1>&2; then
ERROR_MSG="Klipper service not found, please install Klipper first!" && return 0 ERROR_MSG="Klipper service not found, please install Klipper first!" && return 0
fi fi
@@ -167,7 +167,7 @@ create_moonraker_service(){
MR_LOG="${HOME}/klipper_logs/moonraker.log" MR_LOG="${HOME}/klipper_logs/moonraker.log"
MR_CONF="$CFG_PATH/moonraker.conf" MR_CONF="$CFG_PATH/moonraker.conf"
MR_SERV_SRC="${SRCDIR}/kiauh/resources/moonraker.service" MR_SERV_SRC="${SRCDIR}/kiauh/resources/moonraker.service"
MR_SERV_TARGET="$SYSTEMDDIR/moonraker.service" MR_SERV_TARGET="$SYSTEMD_DIR/moonraker.service"
write_mr_service(){ write_mr_service(){
if [ ! -f $MR_SERV_TARGET ]; then if [ ! -f $MR_SERV_TARGET ]; then
@@ -196,7 +196,7 @@ create_moonraker_service(){
while [ $i -le $INSTANCE_COUNT ]; do while [ $i -le $INSTANCE_COUNT ]; do
### rewrite default variables for multi instance cases ### rewrite default variables for multi instance cases
CFG_PATH="$klipper_cfg_loc/printer_$i" 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_CONF="$CFG_PATH/moonraker.conf"
MR_LOG="${HOME}/klipper_logs/moonraker-$i.log" MR_LOG="${HOME}/klipper_logs/moonraker-$i.log"
### write multi instance service ### write multi instance service

4
scripts/install_octoprint.sh
View File

@@ -102,7 +102,7 @@ add_to_groups(){
create_single_octoprint_startscript(){ create_single_octoprint_startscript(){
### create single instance systemd service file ### 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] [Unit]
Description=Starts OctoPrint on startup Description=Starts OctoPrint on startup
After=network-online.target After=network-online.target
@@ -122,7 +122,7 @@ OCTOPRINT
create_multi_octoprint_startscript(){ create_multi_octoprint_startscript(){
### create multi instance systemd service file ### 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] [Unit]
Description=Starts OctoPrint instance $INSTANCE on startup Description=Starts OctoPrint instance $INSTANCE on startup
After=network-online.target After=network-online.target

22
scripts/remove.sh
View File

@@ -2,7 +2,7 @@ remove_klipper(){
shopt -s extglob # enable extended globbing shopt -s extglob # enable extended globbing
### ask the user if he wants to uninstall moonraker too. ### ask the user if he wants to uninstall moonraker too.
###? currently usefull if the user wants to switch from single-instance to multi-instance ###? 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 if ls $FILE 2>/dev/null 1>&2; then
while true; do while true; do
unset REM_MR unset REM_MR
@@ -44,7 +44,7 @@ remove_klipper(){
fi fi
### remove all klipper services ### 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 if ls $FILE 2>/dev/null 1>&2; then
status_msg "Removing Klipper Services ..." status_msg "Removing Klipper Services ..."
for service in $(ls $FILE | cut -d"/" -f5) for service in $(ls $FILE | cut -d"/" -f5)
@@ -52,7 +52,7 @@ remove_klipper(){
status_msg "Removing $service ..." status_msg "Removing $service ..."
sudo systemctl stop $service sudo systemctl stop $service
sudo systemctl disable $service sudo systemctl disable $service
sudo rm -f $SYSTEMDDIR/$service sudo rm -f $SYSTEMD_DIR/$service
ok_msg "Done!" ok_msg "Done!"
done done
### reloading units ### reloading units
@@ -125,7 +125,7 @@ remove_moonraker(){
fi fi
### remove all moonraker services ### 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 if ls $FILE 2>/dev/null 1>&2; then
status_msg "Removing Moonraker Services ..." status_msg "Removing Moonraker Services ..."
for service in $(ls $FILE | cut -d"/" -f5) for service in $(ls $FILE | cut -d"/" -f5)
@@ -133,7 +133,7 @@ remove_moonraker(){
status_msg "Removing $service ..." status_msg "Removing $service ..."
sudo systemctl stop $service sudo systemctl stop $service
sudo systemctl disable $service sudo systemctl disable $service
sudo rm -f $SYSTEMDDIR/$service sudo rm -f $SYSTEMD_DIR/$service
ok_msg "Done!" ok_msg "Done!"
done done
### reloading units ### reloading units
@@ -204,7 +204,7 @@ remove_dwc2(){
status_msg "Removing $service ..." status_msg "Removing $service ..."
sudo systemctl stop $service sudo systemctl stop $service
sudo systemctl disable $service sudo systemctl disable $service
sudo rm -f $SYSTEMDDIR/$service sudo rm -f $SYSTEMD_DIR/$service
ok_msg "Done!" ok_msg "Done!"
done done
### reloading units ### reloading units
@@ -324,7 +324,7 @@ remove_octoprint(){
status_msg "Removing $service ..." status_msg "Removing $service ..."
sudo systemctl stop $service sudo systemctl stop $service
sudo systemctl disable $service sudo systemctl disable $service
sudo rm -f $SYSTEMDDIR/$service sudo rm -f $SYSTEMD_DIR/$service
ok_msg "OctoPrint Service removed!" ok_msg "OctoPrint Service removed!"
done done
### reloading units ### reloading units
@@ -396,7 +396,7 @@ remove_klipperscreen(){
status_msg "Removing KlipperScreen service ..." status_msg "Removing KlipperScreen service ..."
sudo systemctl stop KlipperScreen sudo systemctl stop KlipperScreen
sudo systemctl disable moonraker sudo systemctl disable moonraker
sudo rm -f $SYSTEMDDIR/KlipperScreen.service sudo rm -f $SYSTEMD_DIR/KlipperScreen.service
###reloading units ###reloading units
sudo systemctl daemon-reload sudo systemctl daemon-reload
sudo systemctl reset-failed sudo systemctl reset-failed
@@ -439,7 +439,7 @@ remove_MoonrakerTelegramBot(){
status_msg "Removing MoonrakerTelegramBot service ..." status_msg "Removing MoonrakerTelegramBot service ..."
sudo systemctl stop moonraker-telegram-bot sudo systemctl stop moonraker-telegram-bot
sudo systemctl disable 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 ###reloading units
sudo systemctl daemon-reload sudo systemctl daemon-reload
sudo systemctl reset-failed sudo systemctl reset-failed
@@ -464,10 +464,10 @@ remove_MoonrakerTelegramBot(){
remove_mjpg-streamer(){ remove_mjpg-streamer(){
### remove MJPG-Streamer service ### remove MJPG-Streamer service
if [ -e $SYSTEMDDIR/webcamd.service ]; then if [ -e $SYSTEMD_DIR/webcamd.service ]; then
status_msg "Removing MJPG-Streamer service ..." status_msg "Removing MJPG-Streamer service ..."
sudo systemctl stop webcamd && sudo systemctl disable webcamd sudo systemctl stop webcamd && sudo systemctl disable webcamd
sudo rm -f $SYSTEMDDIR/webcamd.service sudo rm -f $SYSTEMD_DIR/webcamd.service
###reloading units ###reloading units
sudo systemctl daemon-reload sudo systemctl daemon-reload
sudo systemctl reset-failed sudo systemctl reset-failed

2
scripts/update.sh
View File

@@ -75,7 +75,7 @@ update_log_paths(){
source_kiauh_ini source_kiauh_ini
LPATH="${HOME}/klipper_logs" LPATH="${HOME}/klipper_logs"
[ ! -d "$LPATH" ] && mkdir -p "$LPATH" [ ! -d "$LPATH" ] && mkdir -p "$LPATH"
FILE="$SYSTEMDDIR/$1?(-*([0-9])).service" FILE="$SYSTEMD_DIR/$1?(-*([0-9])).service"
for file in $(ls $FILE); do for file in $(ls $FILE); do
[ "$1" == "klipper" ] && LOG="klippy" [ "$1" == "klipper" ] && LOG="klippy"
[ "$1" == "moonraker" ] && LOG="moonraker" [ "$1" == "moonraker" ] && LOG="moonraker"