Changeset 174

Timestamp:

09/22/2007 00:27:52 (4 years ago)

Author:

arjun

Message:

Fixed the import bug.

File:

• trunk/confman/confman (modified) (4 diffs)

trunk/confman/confman

@@ -1 @@
-#! /bin/bash 
+#! /bin/bash  
 #
 # confman provides a command-line interface to Rescomp's server configuration 
@@ -443 +443 @@
 
         # Find the "real" directory's path if not already specified
-        if [[ ! $dir =~ "^\/" ]] ; then
+        if [[ ! $dir =~ ^/ ]] ; then
             dir="${workdir}/${dir}"
         fi
@@ -874 +874 @@
 }
 
-# Dubug mode?
+function audit {
+    tarball=$(conf_fetch)
+    if ! [ -s $tarball ] 
+    then
+        echo "Could not fetch the tarball." >&2
+        exit 1
+    fi
+
+    tmpcopy=$(mktemp -d -t confman)
+    tmproot=$(mktemp -d -t confman)
+
+    tar -xzf $tarball -C $tmpcopy
+    rm -rf $tarball
+    
+    for layer in $LAYERS
+    do
+        local module="${layer}"
+        local moduledir="$tmpcopy/$module"
+
+        for directory in `find $moduledir -type d -mindepth 1| grep -v "\.svn"`; do
+            local tmpdir=`echo $directory | sed "s:$moduledir::"`
+            tmpdir="$tmproot${tmpdir}"
+            local owner=`conf_get_prop ${directory} owner`
+            local group=`conf_get_prop ${directory} group`
+            local mode=`conf_get_prop ${directory} mode`
+            local opts="-d -o $owner -g $group -m $mode"
+            local cmd="sudo install $opts $tmpdir"
+            $cmd
+        done
+        for file in `find $moduledir -type f | grep -v "\.svn"` ; do
+            local tmpfile=`echo "$file" | sed "s:$moduledir::"`
+            local owner=`conf_get_prop ${file} owner`
+            local group=`conf_get_prop ${file} group`
+            local mode=`conf_get_prop ${file} mode`
+            local opts="-Sp -o $owner -g $group -m $mode"
+            local cmd="sudo install $opts $file $tmproot$tmpfile"
+            $cmd
+        done
+    done
+
+    for file in $SINGULARITIES
+    do
+        local livefile="$tmproot${file}"
+        local tmpfile=`mktemp -t confman` || exit 1
+        local owner group mode flag livepart msg
+        for layer in $LAYERS ; do
+            livepart="$tmproot${file}-${layer}"
+            myfile="$tmpcopy/${layer}/${file}-${layer}"
+            if [ -f $myfile -a -f $livepart ] ; then
+                    owner=`conf_get_prop ${myfile} owner`
+                    group=`conf_get_prop ${myfile} group`
+                    mode=`conf_get_prop ${myfile} mode`
+                    comment=`conf_get_prop      ${myfile} comment`
+                cat $livepart >> $tmpfile
+                sudo rm $livepart
+                flag=1
+            fi
+        done
+        if [ ! -z $flag ] ; then
+            local opts="-Sp -o $owner -g $group -m $mode"
+            local cmd="sudo install $opts $tmpfile $livefile"
+            $cmd
+        fi
+        rm -f $tmpfile
+    done
+    rm -rf $tmpcopy
+    sudo /usr/bin/diff -rPu / $tmproot | grep -v "^Only in"
+    sudo rm -rf $tmproot
+    
+}
+
+function tester {
+local asd="asddsa"
+    local output=`echo $asd | grep -v "qw"`
+echo $output
+}
+
+# Debug mode?
 while getopts "d" opt ; do
         case $opt in
@@ -922 +999 @@
     checkclear|chcl|chrm )          checkclear "$@" ;;
     rollback|ro* )                  rollback "$@" ;;
+    audit )                         audit "$@" ;;
+    tester )                        tester "$@" ;;
     * )                             print_usage 1 ;;
 esac