Changeset 7148 for branches/2016/dev_r6393_NOC_WAD/NEMOGCM/TOOLS/MISCELLANEOUS/make_usp_tar.sh

Timestamp:

2016-10-27T17:37:22+02:00 (7 years ago)

Author:

acc

Message:

Branch dev_r6393_NOC_WAD. Tweaks to script for using unsupported configurations on systems without wget access to the internet

File:

• branches/2016/dev_r6393_NOC_WAD/NEMOGCM/TOOLS/MISCELLANEOUS/make_usp_tar.sh (modified) (6 diffs)

branches/2016/dev_r6393_NOC_WAD/NEMOGCM/TOOLS/MISCELLANEOUS/make_usp_tar.sh

@@ -116 +116 @@
        if [ $remfile == 'create_directory' ] ;then
          mkdir $locfile
-         echo $remfile "                 " $locfile >> local.ctl
+         echo $remfile "                 " $locfile >> local_template.ctl
        else
          wget $remfile -O $locfile
          remfile=$(echo $remfile | sed -e "s;.*$locfile;SET_LOCAL_DIRECTORY_HERE/$locfile;")
-         echo $remfile "  " $locfile >> local.ctl
+         echo $remfile "  " $locfile >> local_template.ctl
        fi
       done
@@ -134 +134 @@
 #----------------------------------------------------------------
 #
-   grep -v "$2 " $1 >  uspcfg_local.txt
+   grep -v "$2 " $1 >  uspcfg_local_template.txt
 #
 #----------------------------------------------------------------
@@ -140 +140 @@
 #----------------------------------------------------------------
 #
-   cat cfg.tmp | sed -e "s;http.*$;SET_LOCAL_DIRECTORY_HERE/local.ctl;" >> uspcfg_local.txt
+   cat cfg.tmp | sed -e "s;http.*$;SET_LOCAL_DIRECTORY_HERE/local.ctl;" >> uspcfg_local_template.txt
 #
 #
@@ -161 +161 @@
 # Edit the local.ctl file to set the local directory path
 #
-   ed - local.ctl << EOFA
-g/SET_LOCAL_DIRECTORY_HERE/s;SET_LOCAL_DIRECTORY_HERE;\$basedir;
-w
-q
-EOFA
+   sed -e "s;SET_LOCAL_DIRECTORY_HERE;\$basedir;" local_template.ctl > local.ctl
 #
 # Edit the uspcfg_local.txt file to set the local directory path
 #
-   ed - uspcfg_local.txt << EOFB
-/SET_LOCAL_DIRECTORY_HERE/s;SET_LOCAL_DIRECTORY_HERE;\$basedir;
-w
-q
-EOFB
+   sed -e "s;SET_LOCAL_DIRECTORY_HERE;\$basedir;" uspcfg_local_template.txt > uspcfg_local.txt
+#
+# Install local versions in the named CONFIG directory
+#
    if [ -f \$confdir/uspcfg.txt ] && [ ! -L \$confdir/uspcfg.txt ]; then
     mv \$confdir/uspcfg.txt \$confdir/uspcfg_remote.txt
@@ -196 +191 @@
    fi
 }
+export -f wget
 EOF
 #----------------------------------------------------------------
@@ -217 +213 @@
    fi
 }
+export -f wget
 EOFC
 #----------------------------------------------------------------