Changeset 8252 for branches/2015

Timestamp:

2017-06-29T17:20:03+02:00 (7 years ago)

Author:

nicolasmartin

Message:

#1724 Modify sed command for deleting key in order to match word (use \b)

File:

• branches/2015/nemo_v3_6_STABLE/NEMOGCM/TOOLS/COMPILE/Fdel_keys.sh (modified) (1 diff)

branches/2015/nemo_v3_6_STABLE/NEMOGCM/TOOLS/COMPILE/Fdel_keys.sh

@@ -60 +60 @@
 #
 #-
- echo "Removing keys in : ${NEW_CONF}"
- for i in ${list_del_key} ; do
-        if [ "$(echo ${i} | grep -c key_nproc )" -ne 0 ] ; then
-           sed -e "s/key_nproc[ij]=.* //"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp
-                mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm
-                echo " "
-        elif [ "$(cat ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm | grep -c "$i" )" -ne 0 ] ; then
-         sed -e "s/ ${i}[ ,$]/ /"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp
-         mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm
-         echo "deleted key $i in ${NEW_CONF}"
-        fi
- done
 
- unset -v list_del_key
+echo "Removing keys in : ${NEW_CONF}"
+
+for i in ${list_del_key} ; do
+
+     if [ "$(echo ${i} | grep -c key_nproc )" -ne 0 ]                                     ; then
+        sed -e "s/key_nproc[ij]=.* //" ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm \
+       >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp
+        mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm
+        echo " "
+     elif [ "$(cat ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm | grep -c "$i" )" -ne 0 ]; then
+         sed -e "s/\b${i}\b//" ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm \
+        >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp
+         mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm
+         echo "deleted key $i in ${NEW_CONF}"
+     fi
+
+done
+
+unset -v list_del_key