[DRE-commits] [diaspora-installer] 05/15: fix formatting, use two spaces for indentation

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora-installer.

commit b43f3e4cab17b20f0b2a0d0fefb8a3cab9995bdc
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Sep 27 15:23:24 2016 +0530

    fix formatting, use two spaces for indentation
---
 debian/diaspora-common.config | 262 ++++++++++++++++++++----------------------
 1 file changed, 127 insertions(+), 135 deletions(-)

diff --git a/debian/diaspora-common.config b/debian/diaspora-common.config
index 844f54a..2563990 100644
--- a/debian/diaspora-common.config
+++ b/debian/diaspora-common.config
@@ -6,146 +6,138 @@ set -e
 # source debconf stuff
 . /usr/share/debconf/confmodule
 
-# See if we run long migrations
-if test -f /tmp/flag_diaspora_db_migrations
-then
-    db_input high diaspora-common/dbbackup || true
-    db_go
-    rm -f /tmp/flag_diaspora_db_migrations
-else
-    # What is your pod address?
-    db_input high diaspora-common/url || true
-    db_go
+# What is your pod address?
+db_input high diaspora-common/url || true
+db_go
 
-    # Allow user to disable https for local testing
-    db_input high diaspora-common/ssl || true
-    db_go
+# Allow user to disable https for local testing
+db_input high diaspora-common/ssl || true
+db_go
 
-    db_input high diaspora-common/services || true
-    db_go
-    db_get diaspora-common/services
-    selectedservices=$RET
-    if [ "$RET" != "" ]; then
-        #Check if Facebook is selected
-        servicename="Facebook"
-        if [ "${selectedservices#*$servicename}" != "$RET" ]; then
-            db_beginblock
-            db_input high diaspora-common/facebook_app_id || true
-            db_go
-            db_input high diaspora-common/facebook_secret || true
-            db_go
-            db_endblock
-            db_get diaspora-common/facebook_app_id
-            facebook_app_id=$RET
-            db_get diaspora-common/facebook_secret
-            facebook_secret=$RET
-            # Repeat the questions if user leave any of the two blank
-            while [ "$facebook_app_id" = "" ] || [ "$facebook_secret" = "" ]; do
-                db_beginblock
-                db_input high diaspora-common/facebook_app_id || true
-                db_go
-                db_input high diaspora-common/facebook_secret || true
-                db_go
-                db_endblock
-                db_get diaspora-common/facebook_app_id
-                facebook_app_id=$RET
-                db_get diaspora-common/facebook_secret
-                facebook_secret=$RET
-            done
-        fi
-        servicename="Twitter"
-        if [ "${selectedservices#*$servicename}" != "$selectedservices" ]; then
-            db_beginblock
-            db_input high diaspora-common/twitter_key || true
-            db_go
-            db_input high diaspora-common/twitter_secret || true
-            db_go
-            db_endblock
-            db_get diaspora-common/twitter_key
-            twitter_key=$RET
-            db_get diaspora-common/twitter_secret
-            twitter_secret=$RET
-            # Repeat the questions if user leave any of the two blank
-            while [ "$twitter_key" = "" ] || [ "$twitter_secret" = "" ]; do
-                db_beginblock
-                db_input high diaspora-common/twitter_key || true
-                db_go
-                db_input high diaspora-common/twitter_secret || true
-                db_go
-                db_endblock
-                db_get diaspora-common/twitter_key
-                twitter_key=$RET
-                db_get diaspora-common/twitter_secret
-                twitter_secret=$RET
-            done
-        fi
-        servicename="Tumblr"
-        if [ "${selectedservices#*$servicename}" != "$selectedservices" ]; then
-            db_beginblock
-            db_input high diaspora-common/tumblr_key || true
-            db_go
-            db_input high diaspora-common/tumblr_secret || true
-            db_go
-            db_endblock
-            db_get diaspora-common/tumblr_key
-            tumblr_key=$RET
-            db_get diaspora-common/tumblr_secret
-            tumblr_secret=$RET
-            # Repeat the questions if user leave any of the two blank
-            while [ "$tumblr_key" = "" ] || [ "$tumblr_secret" = "" ]; do
-                db_beginblock
-                db_input high diaspora-common/tumblr_key || true
-                db_go
-                db_input high diaspora-common/tumblr_secret || true
-                db_go
-                db_endblock
-                db_get diaspora-common/tumblr_key
-                tumblr_key=$RET
-                db_get diaspora-common/tumblr_secret
-                tumblr_secret=$RET
-            done
-        fi
-        servicename="Wordpress"
-        if [ "${selectedservices#*$servicename}" != "$selectedservices" ]; then
-            db_beginblock
-            db_input high diaspora-common/wordpress_client_id || true
-            db_go
-            db_input high diaspora-common/wordpress_secret || true
-            db_go
-            db_endblock
-            db_get diaspora-common/wordpress_client_id
-            wordpress_client_id=$RET
-            db_get diaspora-common/wordpress_secret
-            wordpress_secret=$RET
-            # Repeat the questions if user leave any of the two blank
-            while [ "$wordpress_client_id" = "" ] || [ "$wordpress_secret" = "" ]; do
-                db_beginblock
-                db_input high diaspora-common/wordpress_client_id || true
-                db_go
-                db_input high diaspora-common/wordpress_secret || true
-                db_go
-                db_endblock
-                db_get diaspora-common/wordpress_client_id
-                wordpress_client_id=$RET
-                db_get diaspora-common/wordpress_secret
-                wordpress_secret=$RET
-            done
-        fi
-    fi
+db_input high diaspora-common/services || true
+db_go
+db_get diaspora-common/services
+selectedservices=$RET
+if [ "$RET" != "" ]; then
+  #Check if Facebook is selected
+  servicename="Facebook"
+  if [ "${selectedservices#*$servicename}" != "$RET" ]; then
+    db_beginblock
+      db_input high diaspora-common/facebook_app_id || true
+      db_go
+      db_input high diaspora-common/facebook_secret || true
+      db_go
+    db_endblock
+    db_get diaspora-common/facebook_app_id
+    facebook_app_id=$RET
+    db_get diaspora-common/facebook_secret
+    facebook_secret=$RET
+    # Repeat the questions if user leave any of the two blank
+    while [ "$facebook_app_id" = "" ] || [ "$facebook_secret" = "" ]; do
+      db_beginblock
+        db_input high diaspora-common/facebook_app_id || true
+        db_go
+        db_input high diaspora-common/facebook_secret || true
+        db_go
+      db_endblock
+      db_get diaspora-common/facebook_app_id
+      facebook_app_id=$RET
+      db_get diaspora-common/facebook_secret
+      facebook_secret=$RET
+    done
+  fi
+  servicename="Twitter"
+  if [ "${selectedservices#*$servicename}" != "$selectedservices" ]; then
+    db_beginblock
+      db_input high diaspora-common/twitter_key || true
+      db_go
+      db_input high diaspora-common/twitter_secret || true
+      db_go
+    db_endblock
+    db_get diaspora-common/twitter_key
+    twitter_key=$RET
+    db_get diaspora-common/twitter_secret
+    twitter_secret=$RET
+    # Repeat the questions if user leave any of the two blank
+    while [ "$twitter_key" = "" ] || [ "$twitter_secret" = "" ]; do
+      db_beginblock
+        db_input high diaspora-common/twitter_key || true
+        db_go
+        db_input high diaspora-common/twitter_secret || true
+        db_go
+      db_endblock
+      db_get diaspora-common/twitter_key
+      twitter_key=$RET
+      db_get diaspora-common/twitter_secret
+      twitter_secret=$RET
+    done
+  fi
+  servicename="Tumblr"
+  if [ "${selectedservices#*$servicename}" != "$selectedservices" ]; then
+    db_beginblock
+      db_input high diaspora-common/tumblr_key || true
+      db_go
+      db_input high diaspora-common/tumblr_secret || true
+      db_go
+    db_endblock
+    db_get diaspora-common/tumblr_key
+    tumblr_key=$RET
+    db_get diaspora-common/tumblr_secret
+    tumblr_secret=$RET
+    # Repeat the questions if user leave any of the two blank
+    while [ "$tumblr_key" = "" ] || [ "$tumblr_secret" = "" ]; do
+      db_beginblock
+        db_input high diaspora-common/tumblr_key || true
+        db_go
+        db_input high diaspora-common/tumblr_secret || true
+        db_go
+      db_endblock
+      db_get diaspora-common/tumblr_key
+      tumblr_key=$RET
+      db_get diaspora-common/tumblr_secret
+      tumblr_secret=$RET
+    done
+  fi
+  servicename="Wordpress"
+  if [ "${selectedservices#*$servicename}" != "$selectedservices" ]; then
+    db_beginblock
+      db_input high diaspora-common/wordpress_client_id || true
+      db_go
+      db_input high diaspora-common/wordpress_secret || true
+      db_go
+    db_endblock
+    db_get diaspora-common/wordpress_client_id
+    wordpress_client_id=$RET
+    db_get diaspora-common/wordpress_secret
+    wordpress_secret=$RET
+    # Repeat the questions if user leave any of the two blank
+    while [ "$wordpress_client_id" = "" ] || [ "$wordpress_secret" = "" ]; do
+      db_beginblock
+        db_input high diaspora-common/wordpress_client_id || true
+        db_go
+        db_input high diaspora-common/wordpress_secret || true
+        db_go
+      db_endblock
+      db_get diaspora-common/wordpress_client_id
+      wordpress_client_id=$RET
+      db_get diaspora-common/wordpress_secret
+      wordpress_secret=$RET
+    done
+  fi
+fi
 
 
-    # DB password can be left blank
-    db_input high diaspora-common/dbpass || true
-    db_go
+# DB password can be left blank
+db_input high diaspora-common/dbpass || true
+db_go
 
-    # source dbconfig-common shell library, and call the hook function
-    if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
-       . /usr/share/dbconfig-common/dpkg/config
+# source dbconfig-common shell library, and call the hook function
+if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
+   . /usr/share/dbconfig-common/dpkg/config
 
-       dbc_dbtypes="mysql, pgsql"
-       dbc_dbname="diaspora_production"
-       dbc_dbuser="diaspora"
+   dbc_dbtypes="mysql, pgsql"
+   dbc_dbname="diaspora_production"
+   dbc_dbuser="diaspora"
 
-       dbc_go diaspora-common "$@"
-    fi
+   dbc_go diaspora-common "$@"
 fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git