From 66008a89ae2ec98a253a837f477c88d1d54e8c1f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 25 Jun 2018 12:10:02 +0100
Subject: [PATCH] upgrade shortcuts
---
src/freedombone-image-customise | 3 ++-
src/freedombone-shortcuts | 2 ++
src/freedombone-utils-database | 2 +-
src/freedombone-utils-setup | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index a7a9ab8f8..12465392a 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1775,7 +1775,8 @@ image_setup_utils() {
chroot "$rootdir" $INSTALL_PACKAGES apt-transport-https
# shellcheck disable=SC2086
chroot "$rootdir" $REMOVE_PACKAGES_PURGE apache2-bin*
- chroot "$rootdir" apt-get -yq dist-upgrade
+ # shellcheck disable=SC2086
+ chroot "$rootdir" $UPGRADE_PACKAGES
# shellcheck disable=SC2086
chroot "$rootdir" $INSTALL_PACKAGES ca-certificates
# shellcheck disable=SC2086
diff --git a/src/freedombone-shortcuts b/src/freedombone-shortcuts
index 18bb87c73..626c546fe 100755
--- a/src/freedombone-shortcuts
+++ b/src/freedombone-shortcuts
@@ -31,8 +31,10 @@ INSTALL_PACKAGES_BACKPORTS='apt-get -yq -t stretch-backports install'
REMOVE_PACKAGES='apt-get -yq remove'
REMOVE_PACKAGES_PURGE='apt-get -yq remove --purge'
+REMOVE_PURGE='apt-get -yq purge'
UPDATE_PACKAGES='apt-get -yq update'
+UPGRADE_PACKAGES='apt-get -yq dist-upgrade'
PACKAGE_HOLD='apt-mark -q hold'
PACKAGE_UNHOLD='apt-mark -q unhold'
diff --git a/src/freedombone-utils-database b/src/freedombone-utils-database
index 311ad480c..1f0df97f3 100755
--- a/src/freedombone-utils-database
+++ b/src/freedombone-utils-database
@@ -390,7 +390,7 @@ quit" > "$INSTALL_DIR/batch.sql"
function database_reinstall {
- apt-get -yq purge mariadb*
+ $REMOVE_PURGE mariadb*
rm -rf /var/lib/mysql
rm -rf /etc/mysql
sed -i '/mariadb/d' "${HOME}/${PROJECT_NAME}-completed.txt"
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index 97936a65e..6e154c665 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -278,7 +278,7 @@ function initial_setup {
fi
$REMOVE_PACKAGES_PURGE apache2-bin*
- apt-get -yq dist-upgrade
+ $UPGRADE_PACKAGES
$INSTALL_PACKAGES ca-certificates
$INSTALL_PACKAGES apt-utils
$INSTALL_PACKAGES cryptsetup libgfshare-bin duplicity sshpass wget avahi-daemon
--
GitLab