Changeset 18694 for trunk/DataCheck/Sourcefile.sh

Timestamp:

12/18/16 23:46:07 (8 years ago)

Author:

Daniela Dorner

Message:

introduced usage of file for mysql pw to avoid warnings

File:

• trunk/DataCheck/Sourcefile.sh (modified) (4 diffs)

trunk/DataCheck/Sourcefile.sh

@@ -127 +127 @@
 # alias (we cannot check the beginning of the line due to
 # color codes in filldotraw.C)
-alias 'intgrep'='grep -E -o \\\(int\\\)[0-9]+$ | grep -E -o [0-9]+'
+alias 'intgrep'='grep -E -o \\\("(int|Bool_t)"\\\)[0-9]+$ | grep -E -o [0-9]+'
 
 
@@ -168 +168 @@
 {
    db=`grep Database $sqlrc | grep -v '#' | sed -e 's/Database: //' -e 's/ //g'`
-   pw=`grep Password $sqlrc | grep -v '#' | sed -e 's/Password: //' -e 's/ //g'`
+   pw="--password="`grep Password $sqlrc | grep -v '#' | sed -e 's/Password: //' -e 's/ //g'`
    us=`grep User $sqlrc | grep -v '#' | sed -e 's/User: //' -e 's/ //g'`
    ho=`grep URL $sqlrc | grep -v '#' | sed -e 's/ //g' -e 's/URL:mysql:\/\///'`
+   if [ "$sqlpw" != "" ]
+   then 
+      pwfile="--defaults-file=$sqlpw"
+      pw=""
+   fi
 #   echo "setup: "
 #   echo " db: "$db
@@ -183 +188 @@
    getdbsetup
    printprocesslog "DEBUG sendquery QUERY: "$query
-   if ! val=`mysql -s -u $us --password=$pw --host=$ho $db -e " $query "`
+   if ! val=`mysql $pwfile -s -u $us $pw --host=$ho $db -e " $query "`
    then
       printprocesslog "ERROR could not query DB "$db" on host "$ho" with user "$us
@@ -341 +346 @@
    # execute query
    #numproc=`sendquery `#cannot be done with sendquery, because of row counting
-   if ! numproc=`mysql -s -u $us --password=$pw --host=$ho $db -e " $query " | wc -l`
+   if ! numproc=`mysql $pwfile -s -u $us $pw --host=$ho $db -e " $query " | wc -l`
    then
       printprocesslog "ERROR could not query number of processes from db (program: $program, function getstatus)"