Upgrade from previous

src/freedombone

@@ -280,7 +280,7 @@ if [ ! "$?" = "0" ]; then
     exit 768252
 fi
 
-upgrade_installation
+upgrade_installation_from_previous_versions
 setup_utils
 setup_email
 setup_web

src/freedombone-app-tahoelafs

@@ -28,7 +28,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VARIANTS='mesh'
+VARIANTS=''
 
 TAHOELAFS_REPO="https://github.com/tahoe-lafs/tahoe-lafs"
 TAHOELAFS_COMMIT='30b421d48b3d1dae2ef507bf27a1f3816300cd92'

src/freedombone-utils-upgrade

@@ -47,11 +47,11 @@ function create_upgrade_script {
     echo 'create_upgrade_script' >> $COMPLETION_FILE
 }
 
-function upgrade_installation {
+function upgrade_installation_from_previous_versions {
     if [ ! -f $COMPLETION_FILE ]; then
         return
     fi
-    if grep -Fxq "upgrade_installation" $COMPLETION_FILE; then
+    if grep -Fxq "upgrade_installation_from_previous_versions" $COMPLETION_FILE; then
         return
     fi
 
@@ -70,7 +70,7 @@ function upgrade_installation {
         rm /usr/local/bin/zeronetavahi
     fi
 
-    echo 'upgrade_installation' >> $COMPLETION_FILE
+    echo 'upgrade_installation_from_previous_versions' >> $COMPLETION_FILE
 }
 
 # NOTE: deliberately no exit 0