post_install: fix shellcheck warnings

diff --git a/cde/admin/IntegTools/post_install/build_udb_list b/cde/admin/IntegTools/post_install/build_udb_list
index 35d6b83da55303c09b4b1a2e08d294db80435188..6af5c71649051521894da2034a35e901ce91b6b1 100755 (executable)
--- a/cde/admin/IntegTools/post_install/build_udb_list
+++ b/cde/admin/IntegTools/post_install/build_udb_list
@@ -1,4 +1,4 @@
 #!/bin/ksh
 
 awk '{if ($1 == "install_target" && $3 != "") print $3}' \
-       $2/databases/$1.udb >$1.list
+       "$2/databases/$1.udb" >"$1.list"

diff --git a/cde/admin/IntegTools/post_install/configDemos.src b/cde/admin/IntegTools/post_install/configDemos.src
index 7c183bf96f72460eab0cf423eae05c0675b69df6..b0c7006426202eab2cdf10061ee177f29b04732e 100755 (executable)
--- a/cde/admin/IntegTools/post_install/configDemos.src
+++ b/cde/admin/IntegTools/post_install/configDemos.src
@@ -19,19 +19,19 @@ XCOMM #
 XCOMM ############################################
 RemoveDemoFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -45,8 +45,8 @@ VerifyInstalledFiles()
 {
     echo "Status   mode    owner   group   filename"
     echo "-----------------------------------------"
-XCOMM    exists  correct correct correct  /usr/dt/foo1
-XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
+XCOMM     exists  correct correct correct  /usr/dt/foo1
+XCOMM     MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM         exists    the link is correct    /usr/dt/link
 
     while read SRC
@@ -61,17 +61,14 @@ XCOMM         exists    the link is correct    /usr/dt/link
 
 XCOMM ##########################################################################
 XCOMM 
-XCOMM                          Main Body
+XCOMM                                  Main Body
 XCOMM 
 XCOMM ##########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-DEMOS
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/configFonts.src b/cde/admin/IntegTools/post_install/configFonts.src
index 0419454b8d045e7e50095be3bae3ba1563799379..7a8d7ee3bd2fd3351782666159df5c7fb580a556 100755 (executable)
--- a/cde/admin/IntegTools/post_install/configFonts.src
+++ b/cde/admin/IntegTools/post_install/configFonts.src
@@ -15,19 +15,19 @@ XCOMM ############################################
 
 RemoveFontFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -41,11 +41,11 @@ VerifyInstalledFiles()
 {
     echo "Status   mode    owner   group   filename"
     echo "-----------------------------------------"
-XCOMM    exists  correct correct correct  /usr/dt/foo1
-XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
+XCOMM     exists  correct correct correct  /usr/dt/foo1
+XCOMM     MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM         exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "verify.func"
     done <<-EOF
@@ -57,18 +57,15 @@ XCOMM         exists    the link is correct    /usr/dt/link
 
 XCOMM ##########################################################################
 XCOMM 
-XCOMM                          Main Body
+XCOMM                                  Main Body
 XCOMM 
 XCOMM ##########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-FONTS
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/configHelp.src b/cde/admin/IntegTools/post_install/configHelp.src
index fb417a3a0f70906cca3d227fa799edde3c11f677..5cca6674d518968d71fd28ed0e1dcbc650a128a3 100755 (executable)
--- a/cde/admin/IntegTools/post_install/configHelp.src
+++ b/cde/admin/IntegTools/post_install/configHelp.src
@@ -13,19 +13,19 @@ XCOMM #######
 
 RemoveHelpFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -39,11 +39,11 @@ VerifyInstalledFiles()
 {
     echo "Status   mode    owner   group   filename"
     echo "-----------------------------------------"
-XCOMM    exists  correct correct correct  /usr/dt/foo1
-XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
+XCOMM     exists  correct correct correct  /usr/dt/foo1
+XCOMM     MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM         exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "verify.func"
     done <<-EOF
@@ -55,21 +55,18 @@ XCOMM         exists    the link is correct    /usr/dt/link
 
 XCOMM ##########################################################################
 XCOMM 
-XCOMM                          Main Body
+XCOMM                                  Main Body
 XCOMM 
 XCOMM ##########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-HELP-C
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
 XCOMM 
 XCOMM  set up symlinks that point into the $CDE_TOP tree
 XCOMM 
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/configHelpPrg.src b/cde/admin/IntegTools/post_install/configHelpPrg.src
index bdfb3ca76e58f298037a601c20a4b6c6859cd844..dbf416d5cf097e9944e89479c6192eecdd468688 100755 (executable)
--- a/cde/admin/IntegTools/post_install/configHelpPrg.src
+++ b/cde/admin/IntegTools/post_install/configHelpPrg.src
@@ -13,19 +13,19 @@ XCOMM #######
 
 RemoveHelpFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -39,11 +39,11 @@ VerifyInstalledFiles()
 {
     echo "Status   mode    owner   group   filename"
     echo "-----------------------------------------"
-XCOMM    exists  correct correct correct  /usr/dt/foo1
-XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
+XCOMM     exists  correct correct correct  /usr/dt/foo1
+XCOMM     MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM         exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "verify.func"
     done <<-EOF1
@@ -55,17 +55,14 @@ XCOMM         exists    the link is correct    /usr/dt/link
 
 XCOMM ##########################################################################
 XCOMM 
-XCOMM                          Main Body
+XCOMM                                  Main Body
 XCOMM 
 XCOMM ##########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-HELP
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/configHelpRun.src b/cde/admin/IntegTools/post_install/configHelpRun.src
index efc1de3125ac82b84f94350a94611188dc9c8e56..b53a4b510a8ae7f20a4189b9f33afd47569b719a 100755 (executable)
--- a/cde/admin/IntegTools/post_install/configHelpRun.src
+++ b/cde/admin/IntegTools/post_install/configHelpRun.src
@@ -15,19 +15,19 @@ XCOMM ############################################
 
 RemoveHelpRunFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -41,11 +41,11 @@ VerifyInstalledFiles()
 {
     echo "Status   mode    owner   group   filename"
     echo "-----------------------------------------"
-XCOMM    exists  correct correct correct  /usr/dt/foo1
-XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
+XCOMM    exists  correct correct correct  /usr/dt/foo1
+XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM         exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "verify.func"
     done <<-EOF
@@ -57,17 +57,14 @@ XCOMM         exists    the link is correct    /usr/dt/link
 
 XCOMM ##########################################################################
 XCOMM 
-XCOMM                          Main Body
+XCOMM                                  Main Body
 XCOMM 
 XCOMM ##########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-HELP-RUN
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/configIcons.src b/cde/admin/IntegTools/post_install/configIcons.src
index b3015909a52e17b1cd91f3cf3efc3b4b7d247be1..311b3ec3c2fdaedbacc64860870220c13dccab99 100755 (executable)
--- a/cde/admin/IntegTools/post_install/configIcons.src
+++ b/cde/admin/IntegTools/post_install/configIcons.src
@@ -15,19 +15,19 @@ XCOMM ############################################
 
 RemoveIconFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -41,11 +41,11 @@ VerifyInstalledFiles()
 {
     echo "Status   mode    owner   group   filename"
     echo "-----------------------------------------"
-XCOMM    exists  correct correct correct  /usr/dt/foo1
-XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
+XCOMM    exists  correct correct correct  /usr/dt/foo1
+XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM         exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "verify.func"
     done <<-EOF
@@ -57,17 +57,14 @@ XCOMM         exists    the link is correct    /usr/dt/link
 
 XCOMM ##########################################################################
 XCOMM 
-XCOMM                          Main Body
+XCOMM                                  Main Body
 XCOMM 
 XCOMM ##########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-ICONS
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/configInc.src b/cde/admin/IntegTools/post_install/configInc.src
index 5fcc637532f569a0bf6dfcbc64628f34afdee533..58175c4e6ce6f87ac0e57372ecb3a7fb8093e93a 100755 (executable)
--- a/cde/admin/IntegTools/post_install/configInc.src
+++ b/cde/admin/IntegTools/post_install/configInc.src
@@ -15,19 +15,19 @@ XCOMM ############################################
 
 RemoveIncludeFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -41,11 +41,11 @@ VerifyInstalledFiles()
 {
     echo "Status   mode    owner   group   filename"
     echo "-----------------------------------------"
-XCOMM    exists  correct correct correct  /usr/dt/foo1
-XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
+XCOMM    exists  correct correct correct  /usr/dt/foo1
+XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM         exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "verify.func"
     done <<-EOF
@@ -57,17 +57,14 @@ XCOMM         exists    the link is correct    /usr/dt/link
 
 XCOMM ##########################################################################
 XCOMM 
-XCOMM                          Main Body
+XCOMM                                  Main Body
 XCOMM 
 XCOMM ##########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-INC
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/configMan.src b/cde/admin/IntegTools/post_install/configMan.src
index dd7be23ba0f0b66756368ff2985bbdaa8e7d8039..ed5bb0157b95f619b6d98aa6554e61802a828b57 100755 (executable)
--- a/cde/admin/IntegTools/post_install/configMan.src
+++ b/cde/admin/IntegTools/post_install/configMan.src
@@ -15,19 +15,19 @@ XCOMM ############################################
 
 RemoveManFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -41,11 +41,11 @@ VerifyInstalledFiles()
 {
     echo "Status   mode    owner   group   filename"
     echo "-----------------------------------------"
-XCOMM    exists  correct correct correct  /usr/dt/foo1
-XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
+XCOMM    exists  correct correct correct  /usr/dt/foo1
+XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM         exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "verify.func"
     done <<-EOF
@@ -57,17 +57,14 @@ XCOMM         exists    the link is correct    /usr/dt/link
 
 XCOMM ##########################################################################
 XCOMM 
-XCOMM                          Main Body
+XCOMM                                  Main Body
 XCOMM 
 XCOMM ##########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-DEMOS
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/configManDev.src b/cde/admin/IntegTools/post_install/configManDev.src
index 985ba1d8d322d16baf88b3f75ad71c77277f99c4..0ccfea5a30a08fdbf2cd077728266cc848e78d92 100755 (executable)
--- a/cde/admin/IntegTools/post_install/configManDev.src
+++ b/cde/admin/IntegTools/post_install/configManDev.src
@@ -15,30 +15,30 @@ XCOMM ############################################
 
 RemoveManDevFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       if [ -L $SRC -a -d $SRC ]
+       if [ -L "$SRC" ] && [ -d "$SRC" ]
        then
-         results=`ls $SRC`
+         results=$(find -name "$SRC")
          if [ ! -s "$SRC" ]
          then
-           rm -f $SRC
+           rm -f "$SRC"
          else
            continue
          fi
        else
-         rm -f $SRC
+         rm -f "$SRC"
        fi
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -52,11 +52,11 @@ VerifyInstalledFiles()
 {
     echo "Status   mode    owner   group   filename"
     echo "-----------------------------------------"
-XCOMM    exists  correct correct correct  /usr/dt/foo1
-XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
+XCOMM    exists  correct correct correct  /usr/dt/foo1
+XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM         exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "verify.func"
     done <<-EOF
@@ -68,17 +68,14 @@ XCOMM         exists    the link is correct    /usr/dt/link
 
 XCOMM ##########################################################################
 XCOMM 
-XCOMM                          Main Body
+XCOMM                                  Main Body
 XCOMM 
 XCOMM ##########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-MAN-DEV
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/configMsgCat.src b/cde/admin/IntegTools/post_install/configMsgCat.src
index e760148dc84ce095209834013f81b17a8ce9feee..96411103fd61229531fa5fda19892f13e15802bb 100755 (executable)
--- a/cde/admin/IntegTools/post_install/configMsgCat.src
+++ b/cde/admin/IntegTools/post_install/configMsgCat.src
@@ -15,19 +15,19 @@ XCOMM ############################################
 
 RemoveMsgCatFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -41,11 +41,11 @@ VerifyInstalledFiles()
 {
     echo "Status   mode    owner   group   filename"
     echo "-----------------------------------------"
-XCOMM    exists  correct correct correct  /usr/dt/foo1
-XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
+XCOMM    exists  correct correct correct  /usr/dt/foo1
+XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM         exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "verify.func"
     done <<-EOF
@@ -57,17 +57,14 @@ XCOMM         exists    the link is correct    /usr/dt/link
 
 XCOMM ##########################################################################
 XCOMM 
-XCOMM                          Main Body
+XCOMM                                  Main Body
 XCOMM 
 XCOMM ##########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-MSG-C
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/configPrg.src b/cde/admin/IntegTools/post_install/configPrg.src
index 0cfb146cdef0d038fe33c395df5a44f47a698121..3877e43ed7afbfd5df13225f27a055d9d4cffebf 100755 (executable)
--- a/cde/admin/IntegTools/post_install/configPrg.src
+++ b/cde/admin/IntegTools/post_install/configPrg.src
@@ -15,19 +15,19 @@ XCOMM ############################################
 
 RemovePrgFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -41,11 +41,11 @@ VerifyInstalledFiles()
 {
     echo "Status   mode    owner   group   filename"
     echo "-----------------------------------------"
-XCOMM    exists  correct correct correct  /usr/dt/foo1
-XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
+XCOMM    exists  correct correct correct  /usr/dt/foo1
+XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM         exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "verify.func"
     done <<-EOF
@@ -57,17 +57,14 @@ XCOMM         exists    the link is correct    /usr/dt/link
 
 XCOMM ##########################################################################
 XCOMM 
-XCOMM                          Main Body
+XCOMM                                  Main Body
 XCOMM 
 XCOMM ##########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-PRG
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/configShlibs.src b/cde/admin/IntegTools/post_install/configShlibs.src
index a0314384581a50c003d7e753b3647e4131970935..db46766171f7da3404a3dab2844d307b957d49a4 100755 (executable)
--- a/cde/admin/IntegTools/post_install/configShlibs.src
+++ b/cde/admin/IntegTools/post_install/configShlibs.src
@@ -14,19 +14,19 @@ XCOMM #######
 XCOMM ############################################
 RemoveShlibFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -40,11 +40,11 @@ VerifyInstalledFiles()
 {
     echo "Status   mode    owner   group   filename"
     echo "-----------------------------------------"
-XCOMM    exists  correct correct correct  /usr/dt/foo1
-XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
+XCOMM    exists  correct correct correct  /usr/dt/foo1
+XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM         exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "verify.func"
     done <<-EOF
@@ -56,17 +56,14 @@ XCOMM         exists    the link is correct    /usr/dt/link
 
 XCOMM #########################################################################
 XCOMM 
-XCOMM                          Main Body
+XCOMM                                  Main Body
 XCOMM 
 XCOMM #########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-SHLIBS
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/linux/configMin.src b/cde/admin/IntegTools/post_install/linux/configMin.src
index cda5678be44399e9a3b0e8245e42324fe172b625..d67a9d882618118efaf81f73de57a8494707d0b7 100755 (executable)
--- a/cde/admin/IntegTools/post_install/linux/configMin.src
+++ b/cde/admin/IntegTools/post_install/linux/configMin.src
@@ -7,9 +7,6 @@ XCOMM  @(#) $TOG: configMin.src /main/1 1998/03/11 16:18:12 mgreess $
 XCOMM #######
 #define HASH #
 
-PRODUCT=CDE
-FILESET=CDE-MIN
-DO_CONFIGURATION=""
 retval=0
 
 FixEtcServices()
@@ -72,19 +69,19 @@ TMPFILE=/tmp/services
 
 RemoveMinFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -102,7 +99,7 @@ XCOMM          exists  correct correct correct  /usr/dt/foo1
 XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM        exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "../verify.func"
     done <<-EOF
@@ -118,7 +115,7 @@ XCOMM Main Body
 XCOMM
 XCOMM ###############################################################
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "configure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/linux/configRun.src b/cde/admin/IntegTools/post_install/linux/configRun.src
index 02b64e8ca6eb22540b7d695fe1603c6cfaa02dcb..64d7bf077dc1adb2e76f7a639b5aae58f8227a19 100755 (executable)
--- a/cde/admin/IntegTools/post_install/linux/configRun.src
+++ b/cde/admin/IntegTools/post_install/linux/configRun.src
@@ -9,9 +9,6 @@ XCOMM #######
 #define HASH #
 #define STAR *
 
-PRODUCT=CDE
-FILESET=CDE-RUN
-DO_CONFIGURATION=""
 retval=0
 
 CreateAppConfigDirectory()
@@ -21,41 +18,42 @@ CreateAppConfigDirectory()
   HASH all of its subdirectories
   HASH
 
-    cd $DT_CONFIG_TOP
-    if [ ! -d $APPCONFIG ]
+    cd "$DT_CONFIG_TOP" || exit
+    if [ ! -d "$APPCONFIG" ]
     then
-       mkdir $APPCONFIG
+       mkdir "$APPCONFIG"
     fi
 
-    cd $APPCONFIG
+    cd "$APPCONFIG" || exit
 
     for i in $APPCONFIG_DIRS
     do
-       if [ ! -d $i ]
+       (
+       if [ ! -d "$i" ]
        then
-           mkdir $i
+           mkdir "$i"
        fi
-       cd $i
+       cd "$i" || exit
         HASH
        HASH for each locale
        HASH
        for j in $DT_TOP/$APPCONFIG/$i/STAR
        do
-           if [ ! -d `basename $j` ]
+           if [ ! -d "$(basename "$j")" ]
            then
-               mkdir `basename $j`
+               mkdir "$(basename "$j")"
            fi
        done
-       cd ..
+       )
     done
 
 }
 
 doDttermTerminfo()
 {
-    if [ -f $DT_TOP/config/dtterm.ti ]
+    if [ -f "$DT_TOP/config/dtterm.ti" ]
     then
-       tic $DT_TOP/config/dtterm.ti
+       tic "$DT_TOP/config/dtterm.ti"
        if [ -f /usr/share/lib/terminfo/d/dtterm ]
        then
            chown bin /usr/share/lib/terminfo/d/dtterm
@@ -69,7 +67,7 @@ doDttermTerminfo()
                chmod 644 /usr/share/terminfo/d/dtterm
            fi
        fi
-       if [ ! -f /usr/share/lib/terminfo/d/dtterm -a ! -f /usr/share/terminfo/d/dtterm ]
+       if [ ! -f /usr/share/lib/terminfo/d/dtterm ] && [ ! -f /usr/share/terminfo/d/dtterm ]
        then
            echo "Unable to compile $DT_TOP/config/dtterm.ti"       
        fi
@@ -80,19 +78,19 @@ doDttermTerminfo()
 
 RemoveRunFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -122,7 +120,7 @@ XCOMM        exists    the link is correct    /usr/dt/link
 
 PrintUsage()
 {
-  echo "Usage:" $0 "[OPERATION]"
+  echo "Usage:" "$0" "[OPERATION]"
   echo ""
   echo "Operations:"
   echo "    -e        configure"
@@ -140,22 +138,16 @@ XCOMM                             Main Body
 XCOMM
 XCOMM ##########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-RUN
-
 DT_TOP=CDE_INSTALLATION_TOP
 DT_CONFIG_TOP=CDE_CONFIGURATION_TOP
 DT_TEMP_TOP=CDE_LOGFILES_TOP
-ROOT=/
 
 retval=0
 
 APPCONFIG=appconfig
 APPCONFIG_DIRS="appmanager help icons types"
-PRINTERS=""
-DEFAULT_PRINTER="DtPrint"
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "usage" ]
   then
@@ -175,12 +167,12 @@ DEFAULT_PRINTER="DtPrint"
        mkdir -p $DT_TEMP_TOP/$APPCONFIG/appmanager
     fi
 
-    cd $DT_TEMP_TOP
+    cd "$DT_TEMP_TOP" || exit
     mv $APPCONFIG/appmanager .hidden-appmanager
-    chmod -R 755 *
+    chmod -R 755 -- *
     chmod 755 .hidden-appmanager
-    chown -R bin *
-    chgrp -R bin *
+    chown -R bin -- *
+    chgrp -R bin -- *
     mv .hidden-appmanager $APPCONFIG/appmanager
     chmod 755 .
     chown bin .
@@ -209,14 +201,14 @@ DEFAULT_PRINTER="DtPrint"
     HASH Configure Xsession.d
     HASH
 
-    cd $DT_CONFIG_TOP/config
+    cd $DT_CONFIG_TOP/config || exit
     if [ ! -d Xsession.d ]
     then
        mkdir Xsession.d
     fi
 
-    cd $DT_CONFIG_TOP
-    chmod -R 755 *
+    cd $DT_CONFIG_TOP || exit
+    chmod -R 755 -- *
 
     doDttermTerminfo
 

diff --git a/cde/admin/IntegTools/post_install/linux/configShlibs.src b/cde/admin/IntegTools/post_install/linux/configShlibs.src
index cf7ab58797b8e6a519fcccd7a064311df9a65eeb..c61b60ff94a54e5f6142f286086a5d728063e6ae 100755 (executable)
--- a/cde/admin/IntegTools/post_install/linux/configShlibs.src
+++ b/cde/admin/IntegTools/post_install/linux/configShlibs.src
@@ -6,19 +6,19 @@ XCOMM $TOG: configShlibs.src /main/1 1998/03/11 16:18:33 mgreess $
 XCOMM ############################################
 RemoveShlibFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -36,7 +36,7 @@ XCOMM   exists  correct correct correct  /usr/dt/foo1
 XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM        exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "../verify.func"
     done <<-EOF
@@ -54,14 +54,14 @@ XCOMM
 XCOMM creates links in the install tree libtt.so -> libtt.so.1
 XCOMM
 
-  cd CDE_INSTALLATION_TOP/lib
+  cd CDE_INSTALLATION_TOP/lib || exit
 
-  for lib in `/bin/ls *.so.*`
+  for lib in $(/bin/ls) ./*.so.*
   do
-    link=`echo $lib | cut -d. -f1,2`
+    link=$(echo "$lib" | cut -d. -f1,2)
 
-    rm -f $link
-    ln -s $lib $link
+    rm -f "$link"
+    ln -s "$lib" "$link"
 
   done
 
@@ -73,13 +73,10 @@ XCOMM                               Main Body
 XCOMM
 XCOMM #########################################################################
 
-PRODUCT=CDE
-FILESET=CDE-SHLIBS
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
-CDE_CONF_TOP=CDE_CONFIGURATION_TOP
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "deconfigure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/linux/configTT.src b/cde/admin/IntegTools/post_install/linux/configTT.src
index a1a9f64f2785cf5538b15d069752d20b42b15968..4f1ee2f2c7eebc442e183d50bff17f434f5b90fe 100755 (executable)
--- a/cde/admin/IntegTools/post_install/linux/configTT.src
+++ b/cde/admin/IntegTools/post_install/linux/configTT.src
@@ -11,26 +11,23 @@ XCOMM
 XCOMM #######
 #define HASH #
 
-PRODUCT=CDE
-FILESET=CDE-TT
-DO_CONFIGURATION=""
 retval=0
 
 RemoveTTFiles()
 {
-    while read SRC
+    while read -r SRC
     do
       if [ "$SRC" != "" ]
       then
-       rm -f $SRC
+       rm -f "$SRC"
        dirname=${SRC%/STAR}
-       if [ -d $dirname ]
+       if [ -d "$dirname" ]
        then
-         cd $dirname
+         cd "$dirname" || exit
          while [ "$dirname" != "$CDE_TOP" ]
          do
            cd ..
-           rmdir ${dirname##STAR/} >/dev/null 2>/dev/null
+           rmdir "${dirname##STAR/}" >/dev/null 2>/dev/null
            dirname=${dirname%/STAR}
          done
        fi
@@ -48,7 +45,7 @@ XCOMM   exists  correct correct correct  /usr/dt/foo1
 XCOMM    MISSING  WRONG   WRONG   WRONG   /usr/dt/foo2
 XCOMM        exists    the link is correct    /usr/dt/link
 
-    while read SRC
+    while read -r SRC
     do
 #include "../verify.func"
     done <<-EOF
@@ -64,7 +61,7 @@ XCOMM                         Main Body
 XCOMM
 XCOMM ######################################################################
 
-  HandleOption $*
+  HandleOption "$*"
 
   if [ "$OPERATION" = "configure" ]
   then

diff --git a/cde/admin/IntegTools/post_install/size.func b/cde/admin/IntegTools/post_install/size.func
deleted file mode 100644 (file)
index 608a6e8..0000000
--- a/cde/admin/IntegTools/post_install/size.func
+++ /dev/null
@@ -1,14 +0,0 @@
-      if [ "$SRC" != "" ]
-      then
-       set -A tokens $SRC
-       if [ "${tokens[3]}" = "file" ]
-       then
-         if [ -f ${tokens[0]} ]
-         then
-           filesize=`ls -l ${tokens[0]} | awk '{print $5}'`
-           echo "$filesize\t\t\c"
-           echo "${tokens[0]}"
-           let total=total+filesize
-         fi
-       fi
-      fi

diff --git a/cde/admin/IntegTools/post_install/verify.func b/cde/admin/IntegTools/post_install/verify.func
index 886d472e4f60bfb78366c6b8a5258403ff3e8b28..ad25ff44b66959959c6c1fac7bc953984c559b8c 100644 (file)
--- a/cde/admin/IntegTools/post_install/verify.func
+++ b/cde/admin/IntegTools/post_install/verify.func
@@ -1,9 +1,9 @@
       if [ "$SRC" != "" ]
       then
-       set -A tokens $SRC
+       set -A tokens "$SRC"
        if [ "${tokens[3]}" = "file" ]
        then
-         if [ -f ${tokens[0]} ]
+         if [ -f "${tokens[0]}" ]
          then
            printf "exists  "
          else
@@ -13,7 +13,7 @@
          fi
        elif [ "${tokens[3]}" = "sym_link" ]
        then
-         if [ -L ${tokens[0]} ]
+         if [ -L "${tokens[0]}" ]
          then
            printf "exists  "
          else
@@ -26,9 +26,9 @@
        if [ "${tokens[3]}" = "file" ]
        then
          touch /tmp/config-test
-         chmod ${tokens[1]} /tmp/config-test
-         tmpperms=`ls -l /tmp/config-test | awk '{print $1}'`
-         realperms=`ls -l ${tokens[0]} | awk '{print $1}'`
+         chmod "${tokens[1]}" /tmp/config-test
+         tmpperms=$(ls -l /tmp/config-test | awk '{print $1}')
+         realperms=$(ls -l "${tokens[0]}" | awk '{print $1}')
 
          if [ "$tmpperms" = "$realperms" ]
          then
@@ -37,7 +37,7 @@
            printf " WRONG  "
          fi
 
-         owner=`ls -l ${tokens[0]} | awk '{print $3}'`
+         owner=$(ls -l "${tokens[0]}" | awk '{print $3}')
 
          if [ "$owner" = "${tokens[4]}" ]
          then
@@ -46,7 +46,7 @@
            printf " WRONG  "
          fi
 
-         group=`ls -l ${tokens[0]} | awk '{print $4}'`
+         group=$(ls -l "${tokens[0]}" | awk '{print $4}')
 
          if [ "$group" = "${tokens[5]}" ]
          then
@@ -56,7 +56,7 @@
          fi
        elif [ "${tokens[3]}" = "sym_link" ]
        then
-         linkto=`ls -l ${tokens[0]} | awk '{print $11}'`
+         linkto=$(ls -l "${tokens[0]}" | awk '{print $11}')
          if [ "${tokens[2]}" = "$linkto" ]
          then
            printf "  the link is correct    "