Updated Install_RedisGears.sh

Author: rafie

opt/readies

@@ -1,31 +1,94 @@
-if [ -z ${OS+x} ]
-then
-      echo "os is not set"
-      exit 1
-fi
+#!/bin/bash
+
+HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+ROOT=$(cd $HERE/../..; pwd)
+READIES=$ROOT/opt/readies
+. $READIES/shibumi/defs
 
-echo "installing redisgears for :" $OS
+if [[ $1 == --help || $1 == help || $HELP == 1 ]]; then
+	cat <<-END
+		Obtain RedisGears module binaries
 
-WORK_DIR=./bin/RedisGears/
-REDISGEARS_ZIP=redisgears.linux-$OS-x64.master.zip
-REDISGEARS_DEPS=redisgears-python.linux-$OS-x64.master.tgz
-REDISGEARS_S3_PATH=http://redismodules.s3.amazonaws.com/redisgears/snapshots/$REDISGEARS_ZIP
-REDISGEARS_DEPS_S3_PATH=http://redismodules.s3.amazonaws.com/redisgears/snapshots/$REDISGEARS_DEPS
+		Install_RedisGears.sh [--help|help]
+		
+		Argument variables:
+		GEARS_OSNICK=nick   Get binaries for give osnick
+		GEARS_PATH=dir      Get binaries from given Gears repo
+		NOP=1               No operation
+		HELP=1              Show help
+
+	END
+	exit 0
+fi
 
-mkdir -p $WORK_DIR
+OP=""
+[[ $NOP == 1 ]] && OP=echo
 
-if [ -f "$WORK_DIR$REDISGEARS_ZIP" ]; then
-    echo "Skiping RedisGears download"
+os=$($READIES/bin/platform --os)
+arch=$($READIES/bin/platform --arch)
+
+if [[ ! -z $GEARS_PATH ]]; then
+	platform=$($READIES/bin/platform -t)
 else
-    echo "Download RedisGears"
-    wget -P $WORK_DIR $REDISGEARS_S3_PATH
-    unzip $WORK_DIR$REDISGEARS_ZIP -d $WORK_DIR
+	if [[ $os != linux || $arch != x64 ]]; then
+		eprint "Cannot match binary artifacts - build RedisGears and set GEARS_PATH"
+		exit 1
+	fi
+
+	dist=$($READIES/bin/platform --dist)
+	nick=$($READIES/bin/platform --osnick)
+
+	if [[ $dist == ubuntu ]]; then
+		if [[ $nick != bionic && $nick != xenial && $nick != trusty ]]; then
+			nick=bionic
+		fi
+	elif [[ $dist == debian ]]; then
+		nick=bionic
+	elif [[ $dist == centos || $dist == redhat || $dist == fedora ]]; then
+		nick=centos7
+	elif [[ ! -z $GEARS_OSNICK ]]; then
+		nick="$GEARS_OSNICK"
+	else
+		eprint "Cannot match binary artifacts - build RedisGears and set GEARS_PATH"
+		exit 1
+	fi
+	platform="${os}-${nick}-${arch}"
 fi
 
-if [ -f "$WORK_DIR$REDISGEARS_DEPS" ]; then
-    echo "Skiping RedisGears download"
+GEARS_S3_URL=http://redismodules.s3.amazonaws.com/redisgears/snapshots
+GEARS_MOD=redisgears.$platform.master.zip
+GEARS_DEPS=redisgears-python.$platform.master.tgz
+
+FINAL_WORK_DIR=$ROOT/bin/$($READIES/bin/platform -t)/RedisGears
+
+if [[ -d $FINAL_WORK_DIR && -f $FINAL_WORK_DIR/redisgears.so ]]; then
+	echo "RedisGears is in $FINAL_WORK_DIR"
+	exit 0
+fi
+
+$OP rm -rf ${FINAL_WORK_DIR}.*
+WORK_DIR=$(mktemp -d ${FINAL_WORK_DIR}.XXXXXX)
+$OP mkdir -p $WORK_DIR
+
+if [[ -z $GEARS_PATH ]]; then
+	F_GEARS_MOD=$WORK_DIR/$GEARS_MOD
+	if [[ ! -f $F_GEARS_MOD ]]; then
+		echo "Download RedisGears ..."
+		$OP wget -q -P $WORK_DIR $GEARS_S3_URL/$GEARS_MOD
+	fi
+
+	F_GEARS_DEPS=$WORK_DIR/$GEARS_DEPS
+	if [[ ! -f $F_GEARS_DEPS ]]; then
+		echo "Download RedisGears deps ..."
+		$OP wget -q -P $WORK_DIR $GEARS_S3_URL/$GEARS_DEPS
+	fi
 else
-    echo "Download RedisGears deps"
-    wget -P $WORK_DIR $REDISGEARS_DEPS_S3_PATH
-    tar -C $WORK_DIR -xvf $WORK_DIR$REDISGEARS_DEPS
+	F_GEARS_MOD=$GEARS_PATH/artifacts/snapshot/$GEARS_MOD
+	F_GEARS_DEPS=$GEARS_PATH/artifacts/snapshot/$GEARS_DEPS
+	[[ ! -f $F_GEARS_MOD ]] && { eprint "$F_GEARS_MOD is missing"; exit 1; }
+	[[ ! -f $F_GEARS_DEPS ]] && { eprint "$F_GEARS_DEPS is missing"; exit 1; }
 fi
+
+$OP unzip -q $F_GEARS_MOD -d $WORK_DIR
+$OP tar --no-same-owner -C $WORK_DIR -xzf $F_GEARS_DEPS
+$OP mv $WORK_DIR $FINAL_WORK_DIR

tests/flow/Install_RedisGears.sh

@@ -52,12 +52,6 @@ install_git_lfs() {
 
 #----------------------------------------------------------------------------------------------
 
-install_redis_gears() {
-
-  OS=bionic /bin/bash $HERE/Install_RedisGears.sh
-}
-
-#----------------------------------------------------------------------------------------------
 check_redis_server() {
 	if ! command -v redis-server > /dev/null; then
 		echo "Cannot find redis-server. Aborting."
@@ -142,8 +136,7 @@ cd $ROOT/tests/flow
 
 install_git_lfs
 check_redis_server
-install_redis_gears
-
+./Install_RedisGears.sh
 
 [[ ! -z $REDIS ]] && RL_TEST_ARGS+=" --env exiting-env --existing-env-addr $REDIS" run_tests "redis-server: $REDIS"
 [[ $GEN == 1 ]]    && run_tests