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

refactor: rename telegram bot functions

Browse Source 
Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-04-21 10:01:16 +02:00
parent f1ad3c00f4
commit c009ee4382
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
scripts/moonraker-telegram-bot.sh
View File

@@ -21,26 +21,26 @@ function telegram_bot_systemd() {
echo "${services}" echo "${services}"
} }
function install_MoonrakerTelegramBot(){ function install_telegram_bot(){
MoonrakerTelegramBot_setup telegram_bot_setup
do_action_service "restart" "moonraker-telegram-bot" do_action_service "restart" "moonraker-telegram-bot"
} }
function MoonrakerTelegramBot_setup(){ function telegram_bot_setup(){
local klipper_cfg_loc local klipper_cfg_loc
klipper_cfg_loc="$(get_klipper_cfg_dir)" klipper_cfg_loc="$(get_klipper_cfg_dir)"
export klipper_cfg_loc export klipper_cfg_loc
local dep=(virtualenv) local dep=(virtualenv)
dependency_check "${dep[@]}" dependency_check "${dep[@]}"
status_msg "Downloading MoonrakerTelegramBot ..." status_msg "Downloading Moonraker-Telegram-Bot ..."
#force remove existing MoonrakerTelegramBot dir #force remove existing Moonraker-Telegram-Bot dir
[ -d "${MOONRAKER_TELEGRAM_BOT_DIR}" ] && rm -rf "${MOONRAKER_TELEGRAM_BOT_DIR}" [ -d "${MOONRAKER_TELEGRAM_BOT_DIR}" ] && rm -rf "${MOONRAKER_TELEGRAM_BOT_DIR}"
#clone into fresh MoonrakerTelegramBot dir #clone into fresh Moonraker-Telegram-Bot dir
cd "${HOME}" && git clone "${MOONRAKER_TELEGRAM_BOT_REPO}" cd "${HOME}" && git clone "${MOONRAKER_TELEGRAM_BOT_REPO}"
ok_msg "Download complete!" ok_msg "Download complete!"
status_msg "Installing MoonrakerTelegramBot ..." status_msg "Installing Moonraker-Telegram-Bot ..."
/bin/bash "${MOONRAKER_TELEGRAM_BOT_DIR}/scripts/install.sh" /bin/bash "${MOONRAKER_TELEGRAM_BOT_DIR}/scripts/install.sh"
echo; ok_msg "MoonrakerTelegramBot successfully installed!" echo; ok_msg "Moonraker-Telegram-Bot successfully installed!"
} }
@@ -48,44 +48,44 @@ function MoonrakerTelegramBot_setup(){
#=========== REMOVE MOONRAKERTELEGRAMBOT ===========# #=========== REMOVE MOONRAKERTELEGRAMBOT ===========#
#===================================================# #===================================================#
function remove_MoonrakerTelegramBot(){ function remove_telegram_bot(){
### remove MoonrakerTelegramBot dir ### remove Moonraker-Telegram-Bot dir
if [ -d "${MOONRAKER_TELEGRAM_BOT_DIR}" ]; then if [ -d "${MOONRAKER_TELEGRAM_BOT_DIR}" ]; then
status_msg "Removing MoonrakerTelegramBot directory ..." status_msg "Removing Moonraker-Telegram-Bot directory ..."
rm -rf "${MOONRAKER_TELEGRAM_BOT_DIR}" && ok_msg "Directory removed!" rm -rf "${MOONRAKER_TELEGRAM_BOT_DIR}" && ok_msg "Directory removed!"
fi fi
### remove MoonrakerTelegramBot VENV dir ### remove Moonraker-Telegram-Bot VENV dir
if [ -d "${MOONRAKER_TELEGRAM_BOT_ENV_DIR}" ]; then if [ -d "${MOONRAKER_TELEGRAM_BOT_ENV_DIR}" ]; then
status_msg "Removing MoonrakerTelegramBot VENV directory ..." status_msg "Removing Moonraker-Telegram-Bot VENV directory ..."
rm -rf "${MOONRAKER_TELEGRAM_BOT_ENV_DIR}" && ok_msg "Directory removed!" rm -rf "${MOONRAKER_TELEGRAM_BOT_ENV_DIR}" && ok_msg "Directory removed!"
fi fi
### remove MoonrakerTelegramBot service ### remove Moonraker-Telegram-Bot service
if [ -e "${SYSTEMD}/moonraker-telegram-bot.service" ]; then if [ -e "${SYSTEMD}/moonraker-telegram-bot.service" ]; then
status_msg "Removing MoonrakerTelegramBot service ..." status_msg "Removing Moonraker-Telegram-Bot service ..."
do_action_service "stop" "moonraker-telegram-bot" do_action_service "stop" "moonraker-telegram-bot"
do_action_service "disable" "moonraker-telegram-bot" do_action_service "disable" "moonraker-telegram-bot"
sudo rm -f "${SYSTEMD}/moonraker-telegram-bot.service" sudo rm -f "${SYSTEMD}/moonraker-telegram-bot.service"
###reloading units ###reloading units
sudo systemctl daemon-reload sudo systemctl daemon-reload
sudo systemctl reset-failed sudo systemctl reset-failed
ok_msg "MoonrakerTelegramBot Service removed!" ok_msg "Moonraker-Telegram-Bot Service removed!"
fi fi
### remove MoonrakerTelegramBot log ### remove Moonraker-Telegram-Bot log
if [ -e "/tmp/telegram.log" ] || [ -e "${HOME}/klipper_logs/telegram.log" ]; then if [ -e "/tmp/telegram.log" ] || [ -e "${HOME}/klipper_logs/telegram.log" ]; then
status_msg "Removing MoonrakerTelegramBot log file ..." status_msg "Removing Moonraker-Telegram-Bot log file ..."
rm -f "/tmp/telegram.log" "${HOME}/klipper_logs/telegram.log" && ok_msg "File removed!" rm -f "/tmp/telegram.log" "${HOME}/klipper_logs/telegram.log" && ok_msg "File removed!"
fi fi
### remove MoonrakerTelegramBot log symlink in config dir ### remove Moonraker-Telegram-Bot log symlink in config dir
if [ -e "${KLIPPER_CONFIG}/telegram.log" ]; then if [ -e "${KLIPPER_CONFIG}/telegram.log" ]; then
status_msg "Removing MoonrakerTelegramBot log symlink ..." status_msg "Removing Moonraker-Telegram-Bot log symlink ..."
rm -f "${KLIPPER_CONFIG}/telegram.log" && ok_msg "File removed!" rm -f "${KLIPPER_CONFIG}/telegram.log" && ok_msg "File removed!"
fi fi
print_confirm "MoonrakerTelegramBot successfully removed!" print_confirm "Moonraker-Telegram-Bot successfully removed!"
} }
#===================================================# #===================================================#

2
scripts/ui/install_menu.sh
View File

@@ -55,7 +55,7 @@ function install_menu(){
7) 7)
do_action "install_pgc_for_klipper" "install_ui";; do_action "install_pgc_for_klipper" "install_ui";;
8) 8)
do_action "install_MoonrakerTelegramBot" "install_ui";; do_action "install_telegram_bot" "install_ui";;
9) 9)
do_action "install_mjpg-streamer" "install_ui";; do_action "install_mjpg-streamer" "install_ui";;
B|b) B|b)

2
scripts/ui/remove_menu.sh
View File

@@ -50,7 +50,7 @@ function remove_menu(){
7) 7)
do_action "remove_prettygcode" "remove_ui";; do_action "remove_prettygcode" "remove_ui";;
8) 8)
do_action "remove_MoonrakerTelegramBot" "remove_ui";; do_action "remove_telegram_bot" "remove_ui";;
9) 9)
do_action "remove_mjpg-streamer" "remove_ui";; do_action "remove_mjpg-streamer" "remove_ui";;
10) 10)