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

refactor(moonraker.sh): improve error handling during moonraker installation

Browse Source 
Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-05-19 09:19:19 +02:00
parent b0a5d12ecf
commit 377c0cf877
1 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
scripts/moonraker.sh
View File

@@ -138,22 +138,36 @@ function install_moonraker_dependencies() {
read -r -a packages <<< "${packages}" read -r -a packages <<< "${packages}"
### Update system package info ### Update system package info
status_msg "Updating lists of packages..." status_msg "Updating package lists..."
sudo apt-get update --allow-releaseinfo-change if ! sudo apt-get update --allow-releaseinfo-change; then
log_error "failure while updating package lists"
error_msg "Updating package lists failed!"
exit 1
fi
### Install required packages ### Install required packages
status_msg "Installing packages..." status_msg "Installing required packages..."
sudo apt-get install --yes "${packages[@]}" if ! sudo apt-get install --yes "${packages[@]}"; then
log_error "failure while installing required moonraker packages"
error_msg "Installing required packages failed!"
exit 1
fi
} }
function create_moonraker_virtualenv() { function create_moonraker_virtualenv() {
status_msg "Installing python virtual environment..." status_msg "Installing python virtual environment..."
### always create a clean virtualenv ### always create a clean virtualenv
[[ -d ${MOONRAKER_ENV} ]] && rm -rf "${MOONRAKER_ENV}" [[ -d ${MOONRAKER_ENV} ]] && rm -rf "${MOONRAKER_ENV}"
virtualenv -p /usr/bin/python3 "${MOONRAKER_ENV}"
### upgrade pip if virtualenv -p /usr/bin/python3 "${MOONRAKER_ENV}"; then
"${MOONRAKER_ENV}"/bin/pip install -U pip "${MOONRAKER_ENV}"/bin/pip install -U pip
"${MOONRAKER_ENV}"/bin/pip install -r "${MOONRAKER_DIR}/scripts/moonraker-requirements.txt" "${MOONRAKER_ENV}"/bin/pip install -r "${MOONRAKER_DIR}/scripts/moonraker-requirements.txt"
else
log_error "failure while creating python3 moonraker-env"
error_msg "Creation of Moonraker virtualenv failed!"
exit 1
fi
} }
function moonraker_setup() { function moonraker_setup() {
@@ -165,10 +179,7 @@ function moonraker_setup() {
dependency_check "${dep[@]}" dependency_check "${dep[@]}"
### step 1: clone moonraker ### step 1: clone moonraker
status_msg "Downloading Moonraker ..." clone_moonraker "${MOONRAKER_REPO}"
### force remove existing moonraker dir and clone into fresh moonraker dir
[[ -d ${MOONRAKER_DIR} ]] && rm -rf "${MOONRAKER_DIR}"
cd "${HOME}" && git clone "${MOONRAKER_REPO}"
### step 2: install moonraker dependencies and create python virtualenv ### step 2: install moonraker dependencies and create python virtualenv
status_msg "Installing dependencies ..." status_msg "Installing dependencies ..."
@@ -195,6 +206,20 @@ function moonraker_setup() {
print_confirm "${confirm}" && print_mr_ip_list "${instance_arr[0]}" && return print_confirm "${confirm}" && print_mr_ip_list "${instance_arr[0]}" && return
} }
function clone_moonraker() {
local repo=${1}
status_msg "Cloning Moonraker from ${repo} ..."
### force remove existing moonraker dir and clone into fresh moonraker dir
[[ -d ${MOONRAKER_DIR} ]] && rm -rf "${MOONRAKER_DIR}"
if ! git clone "${MOONRAKER_REPO}" "${MOONRAKER_DIR}"; then
print_error "Cloning Moonraker from\n ${repo}\n failed!"
exit 1
fi
}
function create_moonraker_conf() { function create_moonraker_conf() {
local input=("${@}") local input=("${@}")
local moonraker_count=${input[0]} && unset "input[0]" local moonraker_count=${input[0]} && unset "input[0]"
@@ -476,7 +501,7 @@ function update_moonraker() {
do_action_service "stop" "moonraker" do_action_service "stop" "moonraker"
if [[ ! -d ${MOONRAKER_DIR} ]]; then if [[ ! -d ${MOONRAKER_DIR} ]]; then
cd "${HOME}" && git clone "${MOONRAKER_REPO}" clone_moonraker "${MOONRAKER_REPO}"
else else
backup_before_update "moonraker" backup_before_update "moonraker"
status_msg "Updating Moonraker ..." status_msg "Updating Moonraker ..."