Code refactored

get_modules.sh

@@ -10,60 +10,41 @@ if [ ! -z "$STATE" ]; then
    exit 0
 fi
 
-if [ ! -z `hostname -f | grep "bullx"` ]; then
-   ml --show-hidden -t av 2>&1 > /dev/null| awk '{print $1 ",1"}' | grep -v -e '/,\|:' | sort -u > anselm.csv
+if hostname -f | grep -q "bullx"; then
+   ml --show-hidden -t av > /dev/null 2>&1| awk '{print $1 ",1"}' | grep -v -e '/,\|:' | sort -u > anselm.csv
    ./modules.py > anselm.md
 else
-   ml --show-hidden -t av 2>&1 > /dev/null| awk '{print $1 ",2"}' | grep -v -e '/,\|:' | sort -u > salomon.csv
+   ml --show-hidden -t av > /dev/null 2>&1| awk '{print $1 ",2"}' | grep -v -e '/,\|:' | sort -u > salomon.csv
    ./modules.py > salomon.md
 
-   MODULEBASE="/appsuv/modules"
-   MODULEPATH=""
-
-    for dir in `ls $MODULEBASE`
-    do
-        # Exclude following directories
-        if [[ ($dir == "all") ]]; then
-            continue
-        fi
-        # In case that it's directory
-        if [ -d $MODULEBASE/$dir ]; then
-            if [ -z $MODULEPATH ]; then
-                MODULEPATH="$MODULEBASE/$dir"
-            else
-                MODULEPATH="$MODULEPATH:$MODULEBASE/$dir"
+   for resource in "/appsuv/modules,uv2000" "/apps/phi/modules,phi"
+   do
+       MODULEBASE=${resource%,*}
+       FILENAME=${resource#*,}
+       MODULEPATH=""
+
+        for dir in $MODULEBASE
+        do
+            # Exclude following directories
+    	if [[ ($(basename $dir) == "all") ]]; then
+                continue
             fi
-        fi
-    done
-
-   export MODULEPATH
-
-   ml --show-hidden -t av 2>&1 > /dev/null| awk '{print $1 ",4"}' | grep -v -e '/,\|:' | sort -u > uv2000.csv
-   ./modules.py > uv2000.md
-
-   MODULEBASE="/apps/phi/modules"
-   MODULEPATH=""
-
-    for dir in `ls $MODULEBASE`
-    do
-        # Exclude following directories
-        if [[ ($dir == "all") ]]; then
-            continue
-        fi
-        # In case that it's directory
-        if [ -d $MODULEBASE/$dir ]; then
-            if [ -z $MODULEPATH ]; then
-                MODULEPATH="$MODULEBASE/$dir"
-            else
-                MODULEPATH="$MODULEPATH:$MODULEBASE/$dir"
+            # In case that it's directory
+            if [ -d $dir ]; then
+                if [ -z $MODULEPATH ]; then
+                    MODULEPATH=$dir
+                else
+                    MODULEPATH="$MODULEPATH:$MODULEBASE/$dir"
+                fi
             fi
-        fi
-    done
+        done
+
+       export MODULEPATH
 
-   export MODULEPATH
+       ml --show-hidden -t av > /dev/null 2>&1| awk '{print $1 ",4"}' | grep -v -e '/,\|:' | sort -u > "$FILENAME".csv
+       ./modules.py > "$FILENAME".md
 
-   ml --show-hidden -t av 2>&1 > /dev/null| awk '{print $1 ",8"}' | grep -v -e '/,\|:' | sort -u > phi.csv
-   ./modules.py > phi.md
+   done
 fi
 
 DATE=$(date -R)