1 files changed, 2 insertions, 21 deletions
diff --git a/system/valkey/valkey.SlackBuild b/system/valkey/valkey.SlackBuild
index 63574c1a94..a49545716f 100644
--- a/system/valkey/valkey.SlackBuild
+++ b/system/valkey/valkey.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=valkey
-VERSION=${VERSION:-7.2.4}
+VERSION=${VERSION:-7.2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -90,27 +90,12 @@ sed -i "s|-O3||" deps/Makefile deps/hiredis/Makefile
 # http://lists.slackbuilds.org/pipermail/slackbuilds-users/2013-January/010042.html
 ( unset ARCH ; CFLAGS="$SLKCFLAGS" make )
 make install PREFIX=$PKG/usr
-# By default, valkey uses redis binary names
-# We change it to valkey names, but this is optional
-if [ "${VALKEY_BIN:-ON}" == "ON" ]; then
-  pushd $PKG/usr/bin
-  mv redis-benchmark valkey-benchmark
-  mv redis-cli valkey-cli
-  mv redis-server valkey-server
-  rm -f redis-check-aof redis-check-rdb redis-sentinel
-  ln -sf valkey-server valkey-check-aof
-  ln -sf valkey-server valkey-check-rdb
-  ln -sf valkey-server valkey-sentinel
-  popd
-else
-  sed -i 's#bin/valkey#bin/redis#' $CWD/rc.valkey.new 
-fi
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Use sample config and set some sane defaults.
-install -D -m 0644 redis.conf $PKG/etc/valkey/valkey.conf.new
+install -D -m 0644 valkey.conf $PKG/etc/valkey/valkey.conf.new
 sed -i \
   -e 's|^daemonize no|daemonize yes|' \
   -e 's|^dir \.|dir /var/lib/valkey|' \
@@ -140,10 +125,6 @@ if [ ! -z "$VALKEY_PORT" ]; then
  sed -i 's/default is '$VALKEY_PORT'/default is 6379/' $PKG/etc/valkey/valkey.conf.new
  sed -i 's/6379/'$VALKEY_PORT'/' $PKG/etc/valkey/sentinel.conf.new
 fi
-# Final touches on Valkey names
-if [ "${VALKEY_BIN:-ON}" == "ON" ]; then
-  sed -i 's#redis#valkey#g' $PKG/etc/valkey/valkey.conf.new
-fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \