From a5d6c6790687c699d795bcd2aeb9c8f6358a7307 Mon Sep 17 00:00:00 2001 From: nemetho Date: Sun, 31 Dec 2017 16:48:37 +0100 Subject: [PATCH] update bash variable process --- searchfs/_findarchive.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/searchfs/_findarchive.sh b/searchfs/_findarchive.sh index cdec717..ef7df43 100644 --- a/searchfs/_findarchive.sh +++ b/searchfs/_findarchive.sh @@ -24,25 +24,25 @@ else DIR= fi -[ $ARCHIVE != ${ARCHIVE/%.tar.gz/} ] && EXT=".tar.gz" -[ $ARCHIVE != ${ARCHIVE/%.tar.bz2/} ] && EXT=".tar.bz2" -[ $ARCHIVE != ${ARCHIVE/%.tar.xz/} ] && EXT=".tar.xz" -[ $ARCHIVE != ${ARCHIVE/%.tar.lz/} ] && EXT=".tar.lz" -[ $ARCHIVE != ${ARCHIVE/%.tgz/} ] && EXT=".tgz" -[ $ARCHIVE != ${ARCHIVE/%.zip/} ] && EXT=".zip" -WO_EXT=${ARCHIVE/%$EXT/} +[ $ARCHIVE != ${ARCHIVE%.tar.gz} ] && EXT=".tar.gz" +[ $ARCHIVE != ${ARCHIVE%.tar.bz2} ] && EXT=".tar.bz2" +[ $ARCHIVE != ${ARCHIVE%.tar.xz} ] && EXT=".tar.xz" +[ $ARCHIVE != ${ARCHIVE%.tar.lz} ] && EXT=".tar.lz" +[ $ARCHIVE != ${ARCHIVE%.tgz} ] && EXT=".tgz" +[ $ARCHIVE != ${ARCHIVE%.zip} ] && EXT=".zip" +WO_EXT=${ARCHIVE%$EXT} if echo $WO_EXT | grep -q "-"; then if [ "${WO_EXT}" != "${WO_EXT%-rc*}" ]; then WO_RC=${WO_EXT%-rc*} - RC=${WO_EXT/#$WO_RC/} + RC=${WO_EXT#$WO_RC} NAME=${WO_RC%-*} - VER=${WO_RC/#$NAME-/} + VER=${WO_RC#${NAME}-} else NAME=${WO_EXT%-*} - VER=${WO_EXT/#$NAME-/} + VER=${WO_EXT#${NAME}-} [ "$VER" = "master" ] && VER=0 fi -- 2.11.4.GIT