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

refactor: refactor update_system_package_lists

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
th33xitus
2023-06-10 09:55:47 +02:00
parent 7788e7cd87
commit 9b64199a2f
6 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/crowsnest.sh
View File

@@ -212,7 +212,7 @@ function install_crowsnest_dependencies() {
update_system_package_lists update_system_package_lists
### Install required packages ### Install required packages
install_system_packages "$log_name" "packages[@]" install_system_packages "${log_name}" "packages[@]"
} }
function update_crowsnest() { function update_crowsnest() {

2
scripts/klipper.sh
View File

@@ -325,7 +325,7 @@ function install_klipper_packages() {
update_system_package_lists update_system_package_lists
### Install required packages ### Install required packages
install_system_packages "$log_name" "packages[@]" install_system_packages "${log_name}" "packages[@]"
} }
function create_klipper_service() { function create_klipper_service() {

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

@@ -125,7 +125,7 @@ function install_telegram_bot_dependencies() {
update_system_package_lists update_system_package_lists
### Install required packages ### Install required packages
install_system_packages "$log_name" "packages[@]" install_system_packages "${log_name}" "packages[@]"
} }
function create_telegram_bot_virtualenv() { function create_telegram_bot_virtualenv() {

2
scripts/moonraker.sh
View File

@@ -156,7 +156,7 @@ function install_moonraker_dependencies() {
update_system_package_lists update_system_package_lists
### Install required packages ### Install required packages
install_system_packages "$log_name" "packages[@]" install_system_packages "${log_name}" "packages[@]"
} }
function create_moonraker_virtualenv() { function create_moonraker_virtualenv() {

2
scripts/octoeverywhere.sh
View File

@@ -322,7 +322,7 @@ function install_octoeverywhere_dependencies() {
update_system_package_lists update_system_package_lists
### Install required packages ### Install required packages
install_system_packages "$log_name" "packages[@]" install_system_packages "${log_name}" "packages[@]"
} }
#===================================================# #===================================================#

21
scripts/utilities.sh
View File

@@ -307,7 +307,7 @@ function dependency_check() {
update_system_package_lists update_system_package_lists
# install required packages # install required packages
install_system_packages "$log_name" "packages[@]" install_system_packages "${log_name}" "packages[@]"
else else
ok_msg "Dependencies already met!" ok_msg "Dependencies already met!"
@@ -359,8 +359,10 @@ function create_required_folders() {
} }
function update_system_package_lists() { function update_system_package_lists() {
local cache_mtime update_age silent local cache_mtime update_age update_interval silent
if [[ $1 == '--silent' ]]; then silent=1; shift; fi
if [[ $1 == '--silent' ]]; then silent="true"; fi
if [[ -e /var/lib/apt/periodic/update-success-stamp ]]; then if [[ -e /var/lib/apt/periodic/update-success-stamp ]]; then
cache_mtime="$(stat -c %Y /var/lib/apt/periodic/update-success-stamp)" cache_mtime="$(stat -c %Y /var/lib/apt/periodic/update-success-stamp)"
elif [[ -e /var/lib/apt/lists ]]; then elif [[ -e /var/lib/apt/lists ]]; then
@@ -371,17 +373,18 @@ function update_system_package_lists() {
fi fi
update_age="$(($(date +'%s') - cache_mtime))" update_age="$(($(date +'%s') - cache_mtime))"
update_interval=$((48*60*60)) # 48hrs
# update if cache is greater than 48 hours old # update if cache is greater than update_interval
if [[ $update_age -gt $((48*60*60)) ]]; then if (( update_age > update_interval )); then
if [[ ! $silent ]]; then status_msg "Updating package lists..."; fi if [[ ! ${silent} == "true" ]]; then status_msg "Updating package lists..."; fi
if ! sudo apt-get update --allow-releaseinfo-change &>/dev/null; then if ! sudo apt-get update --allow-releaseinfo-change &>/dev/null; then
log_error "Failure while updating package lists!" log_error "Failure while updating package lists!"
if [[ ! $silent ]]; then error_msg "Updating package lists failed!"; fi if [[ ! ${silent} == "true" ]]; then error_msg "Updating package lists failed!"; fi
exit 1 exit 1
else else
log_info "Package lists updated successfully" log_info "Package lists updated successfully"
if [[ ! $silent ]]; then status_msg "Updated package lists."; fi if [[ ! ${silent} == "true" ]]; then status_msg "Updated package lists."; fi
fi fi
else else
log_info "Package lists updated recently, skipping update..." log_info "Package lists updated recently, skipping update..."
@@ -425,7 +428,7 @@ function install_system_packages() {
ok_msg "${log_name^} packages installed!" ok_msg "${log_name^} packages installed!"
else else
log_error "Failure while installing ${log_name,,} packages" log_error "Failure while installing ${log_name,,} packages"
error_msg "Installing $log_name packages failed!" error_msg "Installing ${log_name} packages failed!"
exit 1 # exit kiauh exit 1 # exit kiauh
fi fi
} }