From 48cee467fc50c587088c721ae45cfbd9aeecfe20 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@octopuce.fr>
Date: Fri, 28 Mar 2014 14:53:34 +0100
Subject: [PATCH] fixing color + not calling fixperm everytime :)

---
 debian/alternc-awstats.postinst | 9 +++++----
 debian/alternc.postinst         | 2 --
 debian/alternc.preinst          | 5 -----
 install/upgrades/3.0.0~2.sh     | 7 ++++---
 install/upgrades/3.0.3~b.sh     | 2 +-
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/debian/alternc-awstats.postinst b/debian/alternc-awstats.postinst
index 5fc98b90..396ace7a 100755
--- a/debian/alternc-awstats.postinst
+++ b/debian/alternc-awstats.postinst
@@ -68,14 +68,15 @@ EOF
     # Update rights on previous user's awstats configuration files
     chown alterncpanel:root /etc/awstats/awstats.*.conf > /dev/null 2>&1 || true
 
-    echo "**********************************************"
-    echo "*              ALTERNC-AWSTATS               *"
-    echo "*  Add an autorized user called 'admin' in   *"
-    echo "*   statistics section, so he will access    *"
+    echo -e "\033[31m**********************************************"
+    echo "*  ALTERNC-AWSTATS   ACTION REQUESTED        *"
+    echo "* If you add an autorized user called 'admin'*"
+    echo "* in statistics section, he will access      *"
     echo "*        every stats of every users          *"
     echo "*                                            *"
     echo "* Please run alternc.install to fully deploy *"
     echo "**********************************************"
+    echo -e "\033[0m"
     ;;
 
   abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/alternc.postinst b/debian/alternc.postinst
index 7923270e..9653e192 100644
--- a/debian/alternc.postinst
+++ b/debian/alternc.postinst
@@ -254,8 +254,6 @@ EOF
     # important: postinst freezes without that:
     db_stop
 
-    # instead of preinst, we launch it here : 
-    /usr/lib/alternc/fixperms.sh
     echo -e "\033[31m**********************************************"
     echo "*                                            *"
     echo "*   ALTERNC          ACTION REQUESTED        *"
diff --git a/debian/alternc.preinst b/debian/alternc.preinst
index b9e26528..6a57519d 100644
--- a/debian/alternc.preinst
+++ b/debian/alternc.preinst
@@ -17,11 +17,6 @@ case "$1" in
     ;;
 
   upgrade)
-    # Set correct rights on files
-#    echo "/!\ Warning /!\ Defaults ACL will be applied"
-#    echo "If error, please remount $ALTERNC_LOC with ACL"
-#    echo "and re-run /usr/lib/alternc/fixperms.sh "
-#    /usr/lib/alternc/fixperms.sh
 
     if dpkg --compare-versions "$2" lt "0.9.4"; then
         echo "Upgrading bind configuration"
diff --git a/install/upgrades/3.0.0~2.sh b/install/upgrades/3.0.0~2.sh
index 643f4b42..68ef1a39 100644
--- a/install/upgrades/3.0.0~2.sh
+++ b/install/upgrades/3.0.0~2.sh
@@ -12,7 +12,7 @@ if [ ! -r "$CONFIG_FILE" ]; then
 fi
 
 if [ `id -u` -ne 0 ]; then
-    echo "fixperms.sh must be launched as root"
+    echo "3.0.0~2.sh must be launched as root"
     exit 1
 fi
 
@@ -39,7 +39,7 @@ mysql --defaults-file=/etc/alternc/my.cnf --skip-column-names -B -e "$query" |fi
 ## This part does the migration from Courier IMAP and POP3, preserving IMAP UIDs and POP3 UIDLs. ##
 ## It reads Courier's 'courierimapuiddb' and 'courierpop3dsizelist' files and produces 'dovecot-uidlist' file from it. ##
 # We warn user it will take some time to migrate all indexes
-echo "                                                "
+echo -e "\033[31m"
 echo "################################################"
 echo "# /!\ CONVERTING COURIER INDEXES TO DOVECOT /!\ "
 echo "# /!\        THIS MAY TAKE A WHILE !        /!\ "
@@ -54,7 +54,8 @@ echo "#                                               "
 echo "# Add \"--overwrite\" option if you want to     "
 echo "# overwrite ALL 'dovecot-uidlist' indexes       "
 echo "################################################"
-echo "                                                "
+echo -e "\033[0m"
+
 
 # Stoping dovecot service
 invoke-rc.d dovecot stop || true
diff --git a/install/upgrades/3.0.3~b.sh b/install/upgrades/3.0.3~b.sh
index 2fcbb192..8737d6ee 100755
--- a/install/upgrades/3.0.3~b.sh
+++ b/install/upgrades/3.0.3~b.sh
@@ -12,7 +12,7 @@ if [ ! -r "$CONFIG_FILE" ]; then
 fi
 
 if [ `id -u` -ne 0 ]; then
-    echo "fixperms.sh must be launched as root"
+    echo "3.0.3~b.sh must be launched as root"
     exit 1
 fi