make download and verify nextcloud a function

morph027 · Apr 8, 2017 · d7e9c1b · d7e9c1b
1 parent 59e50d2
commit d7e9c1b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/lib.sh b/lib.sh
@@ -194,6 +194,16 @@ calc_wt_size() {
     export WT_MENU_HEIGHT
 }
 
+download_verify_nextcloud_stable() {
+wget -q -T 10 -t 2 "$NCREPO/$STABLEVERSION.tar.bz2" -P "$HTML"
+mkdir -p "$GPGDIR"
+wget -q "$NCREPO/$STABLEVERSION.tar.bz2.asc" -P "$GPGDIR"
+chmod -R 600 "$GPGDIR"
+gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$OpenPGP_fingerprint"
+gpg --verify "$GPGDIR/$STABLEVERSION.tar.bz2.asc" "$HTML/$STABLEVERSION.tar.bz2"
+rm -r "$GPGDIR"
+}
+
 # Initial download of script in ../static
 # call like: download_static_script name_of_script
 download_static_script() {

diff --git a/nextcloud_install_production.sh b/nextcloud_install_production.sh
@@ -227,14 +227,7 @@ check_command apt install -y \
 apt install open-vm-tools -y
 
 # Download and validate Nextcloud package
-wget -q -T 10 -t 2 "$NCREPO/$STABLEVERSION.tar.bz2" -P "$HTML"
-mkdir -p "$GPGDIR"
-wget -q "$NCREPO/$STABLEVERSION.tar.bz2.asc" -P "$GPGDIR"
-chmod -R 600 "$GPGDIR"
-gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$OpenPGP_fingerprint"
-check_command gpg --verify "$GPGDIR/$STABLEVERSION.tar.bz2.asc" "$HTML/$STABLEVERSION.tar.bz2"
-# Cleanup
-rm -r $GPGDIR
+check_command download_verify_nexcloud_stable
 
 if [ -f "$HTML/$STABLEVERSION.tar.bz2" ]
 then

diff --git a/nextcloud_update.sh b/nextcloud_update.sh
@@ -116,14 +116,7 @@ else
 fi
 
 # Download and validate Nextcloud package
-wget -q -T 10 -t 2 "$NCREPO/$STABLEVERSION.tar.bz2" -P "$HTML"
-mkdir -p "$GPGDIR"
-wget -q "$NCREPO/$STABLEVERSION.tar.bz2.asc" -P "$GPGDIR"
-chmod -R 600 "$GPGDIR"
-gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$OpenPGP_fingerprint"
-check_command gpg --verify "$GPGDIR/$STABLEVERSION.tar.bz2.asc" "$HTML/$STABLEVERSION.tar.bz2"
-# Cleanup
-rm -r $GPGDIR
+check_command download_verify_nextcloud_stable
 
 if [ -f "$HTML/$STABLEVERSION.tar.bz2" ]
 then