lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject [2/2] lucene-solr:branch_5x: SOLR-8946: fix bin/post stdin detection. faulty on Ubuntu; maybe others (cherry picked from commit 7833f7f)
Date Fri, 17 Jun 2016 20:16:40 GMT
SOLR-8946: fix bin/post stdin detection. faulty on Ubuntu; maybe others
(cherry picked from commit 7833f7f)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0b4a81ea
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0b4a81ea
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0b4a81ea

Branch: refs/heads/branch_5x
Commit: 0b4a81eaae07a9e271c74f59f586075d3ee00ca1
Parents: 5d57198
Author: David Smiley <dsmiley@apache.org>
Authored: Fri Apr 15 22:06:54 2016 -0400
Committer: Steve Rowe <sarowe@apache.org>
Committed: Fri Jun 17 16:16:28 2016 -0400

----------------------------------------------------------------------
 solr/bin/post | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0b4a81ea/solr/bin/post
----------------------------------------------------------------------
diff --git a/solr/bin/post b/solr/bin/post
index 92172ab..73e59ed 100755
--- a/solr/bin/post
+++ b/solr/bin/post
@@ -140,7 +140,7 @@ while [ $# -gt 0 ]; do
         shift
         PROPS+=("-Dport=$1")
       elif [[ ("$1" == "-d" || "$1" == "--data" || "$1" == "-") ]]; then
-        if [[ -s /dev/stdin ]]; then
+        if [[ ! -t 0 ]]; then
           MODE="stdin"
         else
           # when no stdin exists and -d specified, the rest of the arguments
@@ -150,6 +150,9 @@ while [ $# -gt 0 ]; do
           if [[ $# -gt 0 ]]; then
             ARGS=("$@")
             shift $#
+          else
+            # SPT needs a valid args string, useful for 'bin/post -c foo -d' to force a commit
+            ARGS+=("<add/>")
           fi
         fi
       else
@@ -209,10 +212,6 @@ if [[ $MODE != "stdin" && $MODE != "args" ]]; then
     PARAMS=("${URLS[@]}")
   fi
 else
-  if [[ ${#ARGS[@]} == 0 ]]; then
-    # SPT needs a valid (to post to Solr) args string, useful for 'bin/post -c foo -d' to
force a commit
-    ARGS+=("<add/>")
-  fi
   PARAMS=("${ARGS[@]}")
 fi
 


Mime
View raw message