Update group command (exit)

yokochi47 · Sep 13, 2018 · a944903 · a944903
1 parent cf3dc6e
commit a944903
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/ask_graph_existance.sh b/ask_graph_existance.sh
@@ -5,7 +5,7 @@ result=ask_graph_existance.result
 
 echo "ASK { GRAPH <$1> { ?s ?p ?o . } }" > $sparql
 
-./run_sparql.sh -s yes -q $sparql > $result || echo "Couldn't connect server." && exit 1
+./run_sparql.sh -s yes -q $sparql > $result || ( echo "Couldn't connect server." && exit 1 )
 
 tail -n 1 $result
 

diff --git a/clear_graph.sh b/clear_graph.sh
@@ -18,7 +18,7 @@ fi
 
 GRAPH_URI=$1
 
-graph_exist=`./ask_graph_existance.sh $GRAPH_URI` || echo GRAPH <$GRAPH_URI> does not exist. && exit 0
+graph_exist=`./ask_graph_existance.sh $GRAPH_URI` || ( echo GRAPH <$GRAPH_URI> does not exist. && exit 0 )
 
 VIRTUOSO_EXEC_COM="log_enable(3,1); SPARQL CLEAR GRAPH <$GRAPH_URI>;"
 echo $VIRTUOSO_EXEC_COM

diff --git a/run_all.sh b/run_all.sh
@@ -109,7 +109,7 @@ for prefix in bmr bms ; do
  ./$prefix"2rdf.sh"
 
  if [ $? != 0 ] || [ -d $prefix"_rdf_err" ] ; then
-  echo "$0 aborted."
+  echo $0 aborted.
   if [ -d $prefix"_rdf_err" ] ; then
    echo "Please check error messages in "$prefix"_rdf_err directory."
   fi
@@ -119,7 +119,7 @@ for prefix in bmr bms ; do
  ./$prefix"chk_rdf.sh"
 
  if [ $? != 0 ] || [ -d $prefix"_rdf_err" ] ; then
-  echo "$0 aborted."
+  echo $0 aborted.
   if [ -d $prefix"_rdf_err" ] ; then
    echo "Please check error messages in "$prefix"_rdf_err directory."
   fi

diff --git a/scripts/_rdf2virtuoso.sh b/scripts/_rdf2virtuoso.sh
@@ -41,7 +41,7 @@ else
 
 fi
 
-./scripts/rdf2virtuoso.sh -p $PREFIX -a $ATOM -u $UPDATE || echo "$0 aborted." && exit 1
+./scripts/rdf2virtuoso.sh -p $PREFIX -a $ATOM -u $UPDATE || ( echo "$0 aborted." && exit 1 )
 
 red='\e[0;31m'
 normal='\e[0m'

diff --git a/scripts/db-user.sh b/scripts/db-user.sh
@@ -10,7 +10,7 @@ if [ $? != 0 ] ; then
 
  DB_USER=bmrb
 
- ( psql -U $DB_USER -l | grep $BMRB_DB ) &>> /dev/null || echo "Not found $BMRB_DB database." && exit 1
+ ( psql -U $DB_USER -l | grep $BMRB_DB ) &>> /dev/null || ( echo "Not found $BMRB_DB database." && exit 1 )
 
 fi