From 4ea2433d3d5ee1e1fc46e35f622049f8c0d093bf Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Thu, 24 Nov 2016 18:37:10 +0000
Subject: [PATCH] Don't include commits as variables, since this makes upgrades
hard
---
src/freedombone-app-etherpad | 3 +--
src/freedombone-app-gnusocial | 3 +--
src/freedombone-app-gogs | 1 -
src/freedombone-app-htmly | 1 -
src/freedombone-app-hubzilla | 4 +---
src/freedombone-app-ipfs | 3 +--
src/freedombone-app-librevault | 2 --
src/freedombone-app-lychee | 1 -
src/freedombone-app-mailpile | 1 -
src/freedombone-app-postactiv | 3 +--
src/freedombone-app-rss | 2 --
src/freedombone-app-tox | 2 --
src/freedombone-app-zeronet | 5 +----
13 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/src/freedombone-app-etherpad b/src/freedombone-app-etherpad
index 7fbb81003..a5494e5bf 100755
--- a/src/freedombone-app-etherpad
+++ b/src/freedombone-app-etherpad
@@ -43,8 +43,7 @@ ETHERPAD_ADMIN_PASSWORD=
ETHERPAD_TITLE=$'Freedombone Docs'
ETHERPAD_WELCOME_MESSAGE=$"Welcome to ${ETHERPAD_TITLE}!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!"
-etherpad_variables=(ETHERPAD_COMMIT
- ONION_ONLY
+etherpad_variables=(ONION_ONLY
DEFAULT_DOMAIN_NAME
ETHERPAD_DOMAIN_NAME
ETHERPAD_CODE
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index c0e23db6f..2303b9663 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -59,8 +59,7 @@ GNUSOCIAL_NSFW_COMMIT='a096bbe0cfae9a9b177682920ffb58d32a48e136'
# script which causes old posts to expire
gnusocial_expire_script=/usr/bin/gnusocial-expire
-gnusocial_variables=(GNUSOCIAL_COMMIT
- ONION_ONLY
+gnusocial_variables=(ONION_ONLY
GNUSOCIAL_DOMAIN_NAME
GNUSOCIAL_CODE
GNUSOCIAL_WELCOME_MESSAGE
diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index df76b26d9..9fd5e6620 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -43,7 +43,6 @@ GIT_ADMIN_PASSWORD=
GOGS_BIN=
gogs_variables=(ONION_ONLY
- GOGS_COMMIT
GIT_ADMIN_PASSWORD
GIT_DOMAIN_NAME
GIT_CODE
diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly
index 14d22e274..14265b190 100755
--- a/src/freedombone-app-htmly
+++ b/src/freedombone-app-htmly
@@ -42,7 +42,6 @@ HTMLY_TITLE="My Blog"
HTMLY_SUBTITLE="Another ${PROJECT_NAME} blog"
htmly_variables=(HTMLY_REPO
- HTMLY_COMMIT
HTMLY_DOMAIN_NAME
HTMLY_CODE
HTMLY_TITLE
diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla
index 01e8efcd2..f445575ff 100755
--- a/src/freedombone-app-hubzilla
+++ b/src/freedombone-app-hubzilla
@@ -49,9 +49,7 @@ hubzilla_variables=(ONION_ONLY
DDNS_PROVIDER
MY_USERNAME
HUBZILLA_REPO
- HUBZILLA_COMMIT
- HUBZILLA_ADDONS_REPO
- HUBZILLA_ADDONS_COMMIT)
+ HUBZILLA_ADDONS_REPO)
function remove_user_hubzilla {
remove_username="$1"
diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs
index d85eca3bb..80a6551aa 100755
--- a/src/freedombone-app-ipfs
+++ b/src/freedombone-app-ipfs
@@ -44,8 +44,7 @@ IPFS_JS_RONIN_VERSION='0.3.11'
IPFS_KEY_LENGTH=2048
IPFS_GO_VERSION=0.4.2
-ipfs_variables=(IPFS_COMMIT
- IPFS_GO_VERSION
+ipfs_variables=(IPFS_GO_VERSION
IPFS_KEY_LENGTH
IPFS_PORT)
diff --git a/src/freedombone-app-librevault b/src/freedombone-app-librevault
index 03a24962e..37b74ccf2 100755
--- a/src/freedombone-app-librevault
+++ b/src/freedombone-app-librevault
@@ -41,9 +41,7 @@ LIBREVAULT_COMMIT='86a6aefcb5cc458f4d42195368fbcff2871f98e3'
LIBREVAULT_PORT=42345
librevault_variables=(PROTOBUF_REPO
- PROTOBUF_COMMIT
LIBREVAULT_REPO
- LIBREVAULT_COMMIT
LIBREVAULT_PORT)
function install_interactive_librevault {
diff --git a/src/freedombone-app-lychee b/src/freedombone-app-lychee
index 167de87f2..0bd0c4f68 100755
--- a/src/freedombone-app-lychee
+++ b/src/freedombone-app-lychee
@@ -40,7 +40,6 @@ LYCHEE_REPO="https://github.com/electerious/Lychee"
LYCHEE_COMMIT='3eaaed72715b30bf10ce66a5f75268467bcb728d'
lychee_variables=(LYCHEE_REPO
- LYCHEE_COMMIT
LYCHEE_DOMAIN_NAME
LYCHEE_CODE
ONION_ONLY
diff --git a/src/freedombone-app-mailpile b/src/freedombone-app-mailpile
index f575b19a8..6162b3910 100755
--- a/src/freedombone-app-mailpile
+++ b/src/freedombone-app-mailpile
@@ -41,7 +41,6 @@ MAILPILE_COMMIT='352ca27a29f7d9525298264c04bc5c7d55887276'
MAILPILE_PORT=33411
mailpile_variables=(MAILPILE_REPO
- MAILPILE_COMMIT
MAILPILE_DOMAIN_NAME
MAILPILE_CODE
ONION_ONLY
diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv
index 91dc34a3d..02b9d1a9e 100755
--- a/src/freedombone-app-postactiv
+++ b/src/freedombone-app-postactiv
@@ -43,8 +43,7 @@ POSTACTIV_ADMIN_PASSWORD=
# script which causes old posts to expire
postactiv_expire_script=/usr/bin/postactiv-expire
-postactiv_variables=(POSTACTIV_COMMIT
- ONION_ONLY
+postactiv_variables=(ONION_ONLY
POSTACTIV_DOMAIN_NAME
POSTACTIV_CODE
DDNS_PROVIDER
diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss
index 7adf40257..da86ea09b 100755
--- a/src/freedombone-app-rss
+++ b/src/freedombone-app-rss
@@ -47,8 +47,6 @@ RSS_READER_GNUSOCIAL_COMMIT='20b2535e3f2b0ddc0117b584bdcaa6bf7a2d9fa2'
rss_variables=(RSS_READER_REPO
RSS_MOBILE_READER_REPO
- RSS_READER_COMMIT
- RSS_MOBILE_READER_COMMIT
RSS_READER_ADMIN_PASSWORD
RSS_READER_DOMAIN_NAME
USB_MOUNT
diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox
index 537bc6819..3500c487f 100755
--- a/src/freedombone-app-tox
+++ b/src/freedombone-app-tox
@@ -54,8 +54,6 @@ QTOX_COMMIT='origin/bashrc/freedombone'
tox_variables=(SYSTEM_TYPE
TOXCORE_REPO
- TOXCORE_COMMIT
- TOXIC_COMMIT
MY_USERNAME
ONION_ONLY
INSTALLED_WITHIN_DOCKER
diff --git a/src/freedombone-app-zeronet b/src/freedombone-app-zeronet
index 4e96e4259..9da52aa73 100755
--- a/src/freedombone-app-zeronet
+++ b/src/freedombone-app-zeronet
@@ -52,10 +52,7 @@ ZERONET_DEFAULT_MAIL_TAGLINE="Mail for the Mesh"
ZERONET_ID_REPO="https://github.com/HelloZeroNet/ZeroID"
ZERONET_ID_COMMIT='ccf14fdc96fa9cdb2ddd8a7ab283a8e17a4f234b'
-zeronet_variables=(ZERONET_BLOG_COMMIT
- ZERONET_MAIL_COMMIT
- ZERONET_FORUM_COMMIT
- TRACKER_PORT
+zeronet_variables=(TRACKER_PORT
ZERONET_PORT
MY_USERNAME
ZERONET_DEFAULT_BLOG_TAGLINE
--
GitLab