Changeset 59

Timestamp:

04/06/2006 20:41:27 (6 years ago)

Author:

ccowart

Message:

Importing not-world-readable files

Location:

confman

Files:

• confman (modified) (2 diffs)
• confmanlib.sh (modified) (3 diffs)

confman/confman

@@ -1 @@
-#! /usr/local/bin/bash
+#! /bin/bash
 #
 # confman provides a command-line interface to Rescomp's server configuration 
@@ -504 +504 @@
                 local count
 
+                # Let's see if we can read the file as ourself:
+                if [ ! -r $file ] ; then
+                        usefile=`mktemp -t confman`
+                        sudo cat $file > $usefile
+                else
+                        usefile="$file"
+                        cat $file > $usefile
+                fi
+
                 # Put all non-alphanumerics into a file
-                awk '{print $1}' $file | egrep -o "^[^-_A-Za-z0-9]" > $tmpfile
-                for char in `cat $file | sort | uniq` ; do
+                awk '{print $1}' $usefile | egrep -o \
+                        "^[^-_A-Za-z0-9]" > $tmpfile
+
+                for char in `cat $tmpfile | sort | uniq` ; do
                         count=`egrep -o "\\$char" $tmpfile | wc -l`
                         if [ $count -gt $biggestcount ] ; then

confman/confmanlib.sh

@@ -1 @@
-#! /usr/local/bin/bash
+#! /bin/bash
+#
 # This file provides shell libraries to our configuration management system.
 # It will be sourced by the relevant Rescomp scripts.
-
+# 
+# Author: Chris Cowart <ccowart@rescomp.berkeley.edu>
+# Date: 30 March 2006
+#
 # $Id$
 
@@ -120 +124 @@
                   mode=`conf_get_prop  ${myfile} mode`
                   comment=`conf_get_prop  ${myfile} comment`
-                  msg="This portion controlled under the ${layer} module."
-                  echo "${comment} $msg" >> $tmpfile
                   cat $livepart >> $tmpfile
                   sudo rm $livepart
@@ -209 +211 @@
   local myfile="${WORK_PATH}/${module}${file}"
   local warning="${comment} ${CONF_WARNING}"
+  local morewarn="${comment} Managed under ${module} module."
   local revision="${comment} \$Id\$"
   echo $file
 
   if [ -z $usefile ] ; then
-          echo -e "${warning}\n${revision}\n" > $myfile
-  elif head -n 1 ${file%-${module}} | grep '^#!' >/dev/null ; then
-          awk "{ if (NR==2) print \"\\n${warning}\\n${revision}\\n\"\$0; 
-                 else print \$0 }" ${file%-${module}} > $myfile
+          echo -e "${warning}\n${morewarn}\n${revision}\n" > $myfile
+  elif head -n 1 ${usefile} | grep '^#!' >/dev/null ; then
+          awk "{if (NR==2) 
+                     print \"\\n${warning}\\n${morewarn}\\n${revision}\\n\"\$0;
+                else print \$0 }" ${usefile} > $myfile
   else
-          echo -e "${warning}\n${revision}\n" > $myfile
-          cat ${file%-${module}} >> $myfile
+          echo -e "${warning}\n${morewarn}\n${revision}\n" > $myfile
+          cat ${usefile} >> $myfile
   fi