Skip to content

Commit

Permalink
Merge pull request #475 from basho/nix/zl/move-tools-scripts-to-sh+
Browse files Browse the repository at this point in the history
*use sh for other *nix'es *add additional fetch call for e.g. freebsd in down...

Reviewed-by: aberghage
  • Loading branch information
borshop committed Mar 25, 2015
2 parents b17dfc6 + 9ab9f2b commit 0114c56
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tools/build-jar.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh
#
# Build JAR file containing customer Solr request handlers.
set -e
Expand Down
6 changes: 4 additions & 2 deletions tools/grab-solr.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh
#
# Script to grab Solr and embed in priv dir. This script assumes it is
# being called from root dir or tools dir.
Expand Down Expand Up @@ -38,12 +38,14 @@ download()
wget --no-check-certificate --progress=dot:mega $1
elif which curl > /dev/null; then
curl --insecure --progress-bar -O $1
elif which fetch > /dev/null; then
fetch --no-verify-peer $1
fi
}

get_solr()
{
if [[ -z ${SOLR_PKG_DIR+x} ]]
if [ -z ${SOLR_PKG_DIR+x} ]
then
if [ -e $TMP_FILE ]; then
echo "Using cached copy of Solr $TMP_FILE"
Expand Down

0 comments on commit 0114c56

Please sign in to comment.