[DRE-commits] [diaspora-installer] 01/01: Move debconf questions to config

Balasankar C balasankarc-guest at moszumanska.debian.org
Tue Dec 1 05:03:45 UTC 2015


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

balasankarc-guest pushed a commit to branch debconf
in repository diaspora-installer.

commit 7f0533c2809e78bc6540defe559e8560187bf75a
Author: Balasankar C <balasankarc at autistici.org>
Date:   Tue Dec 1 10:31:49 2015 +0530

    Move debconf questions to config
---
 debian/diaspora-common.config   | 113 ++++++++++++++++++++++++++++++++++++++++
 debian/diaspora-common.postinst |  78 ---------------------------
 2 files changed, 113 insertions(+), 78 deletions(-)

diff --git a/debian/diaspora-common.config b/debian/diaspora-common.config
index 3638e1d..8f72f72 100644
--- a/debian/diaspora-common.config
+++ b/debian/diaspora-common.config
@@ -25,6 +25,119 @@ else
     db_input high diaspora-common/dbpass || 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
+
+
     # source dbconfig-common shell library, and call the hook function
     if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
        . /usr/share/dbconfig-common/dpkg/config.pgsql
diff --git a/debian/diaspora-common.postinst b/debian/diaspora-common.postinst
index 973293a..975fb6f 100755
--- a/debian/diaspora-common.postinst
+++ b/debian/diaspora-common.postinst
@@ -80,8 +80,6 @@ case "$1" in
             fi
 
             # Check if user want to connect to some third party services
-            db_input high diaspora-common/services || true
-            db_go
             db_get diaspora-common/services
             echo "Services List"
             selectedservices=$RET
@@ -90,116 +88,40 @@ case "$1" in
                 #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
                     echo export SERVICES_FACEBOOK_ENABLE=true >> /etc/diaspora.conf
                     echo export SERVICES_FACEBOOK_APP_ID=$facebook_app_id >> /etc/diaspora.conf
                     echo export SERVICES_FACEBOOK_SECRET=$facebook_secret >> /etc/diaspora.conf
                 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
                     echo export SERVICES_TWITTER_ENABLE=true >> /etc/diaspora.conf
                     echo export SERVICES_TWITTER_KEY=$twitter_key >> /etc/diaspora.conf
                     echo export SERVICES_TWITTER_SECRET=$twitter_secret >> /etc/diaspora.conf
                 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
                     echo export SERVICES_TUMBLR_ENABLE=true >> /etc/diaspora.conf
                     echo export SERVICES_TUMBLR_KEY=$tumblr_key >> /etc/diaspora.conf
                     echo export SERVICES_TUMBLR_SECRET=$tumblr_secret >> /etc/diaspora.conf
                 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
                     echo export SERVICES_WORDPRESS_ENABLE=true >> /etc/diaspora.conf
                     echo export SERVICES_WORDPRESS_CLIENT_ID=$wordpress_client_id >> /etc/diaspora.conf
                     echo export SERVICES_WORDPRESS_SECRET=$wordpress_secret >> /etc/diaspora.conf

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



More information about the Pkg-ruby-extras-commits mailing list