postgresql-setup: lint

Rather use the --ignore-space-change when showing differences.

Version: 9.3.2-2

postgresql-setup

@@ -1,16 +1,19 @@
 #!/bin/sh
 #
-# postgresql-setup	Initialization and upgrade operations for PostgreSQL
+# postgresql-setup - Initialization and upgrade operations for PostgreSQL
 
 # PGVERSION is the full package version, e.g., 9.0.2
 # Note: the specfile inserts the correct value during package build
 PGVERSION=xxxx
+
 # PGENGINE is the directory containing the postmaster executable
 # Note: the specfile inserts the correct value during package build
 PGENGINE=xxxx
+
 # PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
 # Note: the specfile inserts the correct value during package build
 PREVMAJORVERSION=xxxx
+
 # PREVPGENGINE is the directory containing the previous postmaster executable
 # Note: the specfile inserts the correct value during package build
 PREVPGENGINE=xxxx
@@ -18,8 +21,7 @@ PREVPGENGINE=xxxx
 # Absorb configuration settings from the specified systemd service file,
 # or the default "postgresql" service if not specified
 SERVICE_NAME="$2"
-if [ x"$SERVICE_NAME" = x ]
+if [ x"$SERVICE_NAME" = x ]; then
-then
     SERVICE_NAME=postgresql
 fi
 
@@ -28,9 +30,7 @@ fi
 PGDATA=`systemctl show -p Environment "${SERVICE_NAME}.service" |
                 sed 's/^Environment=//' | tr ' ' '\n' |
                 sed -n 's/^PGDATA=//p' | tail -n 1`
-
+if [ x"$PGDATA" = x ]; then
-if [ x"$PGDATA" = x ]
-then
     echo "failed to find PGDATA setting in ${SERVICE_NAME}.service"
     exit 1
 fi
@@ -38,9 +38,7 @@ fi
 PGPORT=`systemctl show -p Environment "${SERVICE_NAME}.service" |
                 sed 's/^Environment=//' | tr ' ' '\n' |
                 sed -n 's/^PGPORT=//p' | tail -n 1`
-
+if [ x"$PGPORT" = x ]; then
-if [ x"$PGPORT" = x ]
-then
     echo "failed to find PGPORT setting in ${SERVICE_NAME}.service"
     exit 1
 fi
@@ -55,8 +53,7 @@ export PGDATA
 export PGPORT
 
 # For SELinux we need to use 'runuser' not 'su'
-if [ -x /sbin/runuser ]
+if [ -x /sbin/runuser ]; then
-then
     SU=runuser
 else
     SU=su
@@ -66,8 +63,7 @@ script_result=0
 
 # code shared between initdb and upgrade actions
 perform_initdb(){
-	if [ ! -e "$PGDATA" ]
+    if [ ! -e "$PGDATA" ]; then
-	then
         mkdir "$PGDATA" || return 1
         chown postgres:postgres "$PGDATA"
         chmod go-rwx "$PGDATA"
@@ -76,8 +72,7 @@ perform_initdb(){
     [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
 
     # Create the initdb log file if needed
-	if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
+    if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]; then
-	then
         touch "$PGLOG" || return 1
         chown postgres:postgres "$PGLOG"
         chmod go-rwx "$PGLOG"
@@ -85,7 +80,8 @@ perform_initdb(){
     fi
 
     # Initialize the database
-	$SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" >> "$PGLOG" 2>&1 < /dev/null
+    $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" \
+                    >> "$PGLOG" 2>&1 < /dev/null
 
     # Create directory for postmaster log files
     mkdir "$PGDATA/pg_log"
@@ -93,23 +89,20 @@ perform_initdb(){
     chmod go-rwx "$PGDATA/pg_log"
     [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA/pg_log"
 
-	if [ -f "$PGDATA/PG_VERSION" ]
+    if [ -f "$PGDATA/PG_VERSION" ]; then
-	then
         return 0
     fi
     return 1
 }
 
 initdb(){
-    if [ -f "$PGDATA/PG_VERSION" ]
+    if [ -f "$PGDATA/PG_VERSION" ]; then
-    then
         echo $"Data directory is not empty!"
         echo
         script_result=1
     else
         echo -n $"Initializing database ... "
-	if perform_initdb
+        if perform_initdb; then
-	then
             echo $"OK"
         else
             echo $"failed, see $PGLOG"
@@ -125,12 +118,12 @@ upgrade(){
          x`cat "$PGDATA/PG_VERSION"` != x"$PREVMAJORVERSION" ]
     then
         echo
-	echo $"Cannot upgrade because database is not of version $PREVMAJORVERSION."
+        echo $"Cannot upgrade because the database in $PGDATA is not of"
+        echo $"compatible previous version $PREVMAJORVERSION."
         echo
         exit 1
     fi
-    if [ ! -x "$PGENGINE/pg_upgrade" ]
+    if [ ! -x "$PGENGINE/pg_upgrade" ]; then
-    then
         echo
         echo $"Please install the postgresql-upgrade RPM."
         echo
@@ -164,14 +157,13 @@ upgrade(){
         # For fluent upgrade 'postgres' user should be able to connect
         # to any database without password.  Temporarily, no other type
         # of connection is needed.
-        /usr/bin/echo -e "local all postgres ident" > "$PGDATAOLD/pg_hba.conf"
+        echo "local all postgres ident" > "$PGDATAOLD/pg_hba.conf"
     fi
 
     echo -n $"Upgrading database: "
 
     # Create empty new-format database
-    if perform_initdb
+    if perform_initdb; then
-    then
         # Do the upgrade
         $SU -l postgres -c "$PGENGINE/pg_upgrade \
                         '--old-bindir=$PREVPGENGINE' \
@@ -181,8 +173,7 @@ upgrade(){
                         --link \
                         '--old-port=$PGPORT' '--new-port=$PGPORT' \
                         --user=postgres" >> "$PGUPLOG" 2>&1 < /dev/null
-	if [ $? -ne 0 ]
+        if [ $? -ne 0 ]; then
-	then
             # pg_upgrade failed
             script_result=1
         fi
@@ -191,13 +182,12 @@ upgrade(){
         script_result=1
     fi
 
+    # Move back the backed-up pg_hba.conf regardless of the script_result.
     if [ x$HBA_CONF_BACKUP_EXISTS = x1 ]; then
         mv -f "$HBA_CONF_BACKUP" "$PGDATAOLD/pg_hba.conf"
     fi
 
-
+    if [ $script_result -eq 0 ]; then
-    if [ $script_result -eq 0 ]
-    then
         echo $"OK"
         echo
         echo $"The configuration files was replaced by default configuration."
@@ -207,7 +197,6 @@ upgrade(){
         # Clean up after failure
         rm -rf "$PGDATA"
         mv "$PGDATAOLD" "$PGDATA"
-
         echo $"failed"
     fi
     echo

postgresql.spec

@@ -1122,6 +1122,9 @@ fi
 %endif
 
 %changelog
+* Fri Dec 13 2013 Pavel Raiskup <praiskup@redhat.com> - 9.3.2-2
+- lint the postgresql-setup script
+
 * Thu Dec 12 2013 Jozef Mlich <jmlich@redhat.com> - 9.3.2-2
 - don't fail if user has badly configure 'postgres' user access (#1040364)