Fix non-breaking whitespaces in the post-install script

Author: mohierf

alignak/version.py

@@ -2,4 +2,4 @@
 This module provide Alignak current version
 """
 
-VERSION = "1.1.0rc6"
+VERSION = "1.1.0rc7"

bin/post-install.sh

@@ -27,13 +27,14 @@ echo "-----"
 echo "Detecting OS platform"
 platform='unknown'
 unamestr=`uname`
-if [[ "$unamestr" == 'Linux' ]]; then
+echo "-> system is: $unamestr"
+if [ "$unamestr" = 'Linux' ]; then
    platform='linux'
-elif [[ "$unamestr" == 'FreeBSD' ]]; then
+elif [ "$unamestr" = 'FreeBSD' ]; then
    platform='freebsd'
 fi
 echo "-> found ${platform}"
-if [[ $platform == 'linux' ]]; then
+if [ "$platform" = 'linux' ]; then
    ## Create user and group
    echo "Checking / creating '$ACCOUNT' user and users group"
    id -u $ACCOUNT &>/dev/null || useradd $ACCOUNT --system --no-create-home --user-group -c "Alignak daemons user"
@@ -43,10 +44,10 @@ if [[ $platform == 'linux' ]]; then
 #   getent group nagios || groupadd nagios
 #
 #   ## Add user to nagios group
-#   id -Gn $ACCOUNT |grep -E '(^|[[:blank:]])nagios($|[[:blank:]])' >/dev/null ||
+#   id -Gn $ACCOUNT |grep -E '(^|[:blank:])nagios($|[:blank:])' >/dev/null ||
 #      echo "Adding user '$ACCOUNT' to the nagios users group"
 #      usermod -a -G nagios $ACCOUNT
-elif [[ $platform == 'freebsd' ]]; then
+elif [ "$platform" = 'freebsd' ]; then
    ## Create user and group
    echo "Checking / creating '$ACCOUNT' user and users group"
    id -u $ACCOUNT &>/dev/null || pw adduser $ACCOUNT -d /nonexistent -s /usr/sbin/nologin -c "Alignak daemons user"

etc/alignak.d/daemons.ini

@@ -3,7 +3,7 @@
 # This daemon name is usually built with the daemon type (eg. arbiter, poller,...) and the
 # daemon name separated with a dash.
 #
-# The previous rules ensure that Alignak will be able to find all the daemons configuration
+# The previous rules ensure that Alignak will be able to find all the daemons configuration
 # in this file whatever the number of daemons is existing in the configuration
 #
 # To be easily used as a configuration variable of this file, the daemon name is repeated
@@ -41,7 +41,7 @@ name=scheduler-master
 ; My listening interface
 ;host=0.0.0.0
 port=7768
-# My adress for the other daemons
+; My adress for the other daemons
 ;address=127.0.0.1
 
 ; Modules
@@ -165,7 +165,7 @@ port=7772
 max_queue_size=100000
 
 ; Gets the arbiter broks
-; There must only be one and only one broker that gets the broks created by the arbiter
+; There must only be one and only one broker that gets the broks created by the arbiter
 ; Do not set this parameter for all other brokers because it defaults to False.
 manage_arbiters=1
 

etc/alignak.ini

@@ -1,13 +1,13 @@
-#
-# This configuration file is the main Alignak configuration entry point. Each Alignak installer
-# will adapt the content of this file according to the installation process. This will allow
-# any Alignak extension or third party application to find where the Alignak components and
-# files are located on the system.
-#
-# ---
-# This version of the file contains variable that are suitable to run a single node Alignak
-# with all its daemon using the default configuration existing in the repository.
-#
+;
+; This configuration file is the main Alignak configuration entry point. Each Alignak installer
+; will adapt the content of this file according to the installation process. This will allow
+; any Alignak extension or third party application to find where the Alignak components and
+; files are located on the system.
+;
+; ---
+; This version of the file contains variable that are suitable to run a single node Alignak
+; with all its daemon using the default configuration existing in the repository.
+;
 
 
 ; Declaring script macros

tests_integ/test_daemons_api.py

@@ -64,6 +64,8 @@ def setUp(self):
         super(TestDaemonsApi, self).setUp()
 
         self.cfg_folder = '/tmp/alignak'
+        if os.path.exists(self.cfg_folder):
+            shutil.rmtree(self.cfg_folder)
         cfg_dir = 'default_many_hosts'
         hosts_count = 10
         daemons_list = ['broker-master', 'poller-master', 'reactionner-master',
@@ -1247,7 +1249,7 @@ def _get_stats(self, req, satellite_map, details, run=False):
             if name in ['scheduler']:
                 assert "livesynthesis" in data
                 livesynthesis = data['livesynthesis']
-                print("%s, my livesythesis: %s" % (name, livesynthesis))
+                print("%s, my livesynthesis: %s" % (name, livesynthesis))
                 if not run:
                     assert livesynthesis["hosts_total"] == 13
                     assert livesynthesis["hosts_up_hard"] == 13