]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Everything just calls redis-cli now...
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Sat, 26 Jan 2019 13:10:05 +0000 (20:10 +0700)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Sat, 26 Jan 2019 13:10:05 +0000 (20:10 +0700)
scripts/travis/redis-setup.sh

index 7a63d2cbb463f9cc2cdfb35800ff3a18196d041a..9247c8832b0e8fec7f60a4195a40c98a89df179b 100755 (executable)
@@ -28,23 +28,8 @@ if [ ! -e "${TMP_REDIS_DIR}/create-cluster" ]; then
 fi
 
 # Fix hardcoded paths in the test script
-sed -ie "s#../../src/redis-trib.rb#${TMP_REDIS_DIR}/redis-trib.rb#" "${TMP_REDIS_DIR}/create-cluster"
 sed -ie "s#../../src/##" "${TMP_REDIS_DIR}/create-cluster"
 
-if [ ! -e "${TMP_REDIS_DIR}/redis-trib.rb" ]; then
-    curl https://raw.githubusercontent.com/antirez/redis/unstable/src/redis-trib.rb > "${TMP_REDIS_DIR}/redis-trib.rb"
-    chmod +x "${TMP_REDIS_DIR}/redis-trib.rb"
-fi
-
-# Make redis-trib non interactive
-sed -ie 's/yes_or_die "\(.*\)"/xputs "\1 Yes!"/' "${TMP_REDIS_DIR}/redis-trib.rb"
-
-# Install the 'redis' gem (needed for redis-trib) - not actually needed by travis
-# but is useful if we're running redis-setup.sh locally.
-if [ `gem list redis -i` = 'false' ]; then
-    gem install redis
-fi
-
 # Again, not needed by travis, but useful for local testing
 if [ "$1" = 'stop' ]; then
     create-cluster stop