Changeset 25815

Timestamp:

2012-06-26T10:53:40+12:00 (11 years ago)

Author:

jmt12

Message:

Fixed a bunch of 'bugs' that left behind newlines (hardly fatal, but ugly after you've run this several times)

File:

• gs2-extensions/tdb-edit/trunk/src/disable_tdb.sh (modified) (1 diff)

gs2-extensions/tdb-edit/trunk/src/disable_tdb.sh

@@ -36 +36 @@
 # BUG: leaves behind the newlines...
 sed -i '/^#include "tdbclass.h" \/\/TDB/ d' $GSDLHOME/runtime-src/src/colservr/collectset.cpp
-sed -i '/^if (infodbtype == "tdb") {db_ptr = new tdbclass(gsdlhome);} \/\/TDB/ d' $GSDLHOME/runtime-src/src/colservr/collectset.cpp
-sed -i '/^if (infodbtype == "tdbserver") {db_ptr = new tdbclass(gsdlhome);} \/\/TDBServer/ d' $GSDLHOME/runtime-src/src/colservr/collectset.cpp
+sed -i '/^[ ]*if (infodbtype == "tdb") {db_ptr = new tdbclass(gsdlhome);} \/\/TDB/ d' $GSDLHOME/runtime-src/src/colservr/collectset.cpp
+sed -i '/^[ ]*if (infodbtype == "tdbserver") {db_ptr = new tdbclass(gsdlhome);} \/\/TDBServer/ d' $GSDLHOME/runtime-src/src/colservr/collectset.cpp
 # - collectserver.cpp
 sed -i '/^if (infodbtype == "tdb") { } \/\/ TDB Do nothing/ d' $GSDLHOME/runtime-src/src/colservr/collectset.cpp