From 2f8bb3c29ffabe74c1e3cfbad5d338116a35c75b Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 20 Apr 2023 21:12:22 +0200 Subject: [PATCH] clean renaming scripts (#52791) --- scripts/rename_class.sh | 38 -------------------------------------- scripts/rename_cpp.sh | 12 ++++++------ 2 files changed, 6 insertions(+), 44 deletions(-) delete mode 100755 scripts/rename_class.sh diff --git a/scripts/rename_class.sh b/scripts/rename_class.sh deleted file mode 100755 index 701203f984b..00000000000 --- a/scripts/rename_class.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -# - -# Denis Rouzaud -# 13.01.2016 - -#set -e - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -FILEPATH=$1 -OLDCLASS=$2 -NEWCLASS=$3 - -OLDCLASSUPPER="${OLDCLASS^^}" -OLDCLASSLOWER="${OLDCLASS,,}" -NEWCLASSUPPER="${NEWCLASS^^}" -NEWCLASSLOWER="${NEWCLASS,,}" - - -if [[ ${FILEPATH:(-1)} = "/" ]]; then - PATH="${FILEPATH::-1}" -fi - -FILES=$(git ls-tree --name-only -r HEAD | grep ".*\.\(sip\|cpp\|h\|txt\)$") - -for f in $FILES -do - sed -i s/"$OLDCLASS"/"$NEWCLASS"/g "$f" - sed -i s/"$OLDCLASSUPPER"/"$NEWCLASSUPPER"/g "$f" - sed -i s/"$OLDCLASSLOWER"/"$NEWCLASSLOWER"/g "$f" -done - -git mv $DIR/../src/$FILEPATH/$OLDCLASSLOWER.h $DIR/../src/$FILEPATH/$NEWCLASSLOWER.h -git mv $DIR/../src/$FILEPATH/$OLDCLASSLOWER.cpp $DIR/../src/$FILEPATH/$NEWCLASSLOWER.cpp -git mv $DIR/../python/$FILEPATH/$OLDCLASSLOWER.sip $DIR/../python/$FILEPATH/$NEWCLASSLOWER.sip - diff --git a/scripts/rename_cpp.sh b/scripts/rename_cpp.sh index 72876a6b1f9..952df73c9e7 100755 --- a/scripts/rename_cpp.sh +++ b/scripts/rename_cpp.sh @@ -2,7 +2,7 @@ # This scripts renames the name of a class as well as its header and cpp file # (assuming they are the lowercase version of the class name). -# +# # Usage: ./scripts/rename_cpp.sh src/core QgsMyClassName QgsMyNewClassName set -e @@ -23,12 +23,12 @@ NEW_CLASSUPPER="${NEW_CLASSNAME^^}" NEW_CLASSLOWER="${NEW_CLASSNAME,,}" -FILES=$(ag -c $OLD_CLASSNAME | cut -d: -f1) - +FILES=$(git grep $OLD_CLASSLOWER -- src python | cut -d: -f1) for f in ${FILES}; do - ${GP}sed -i s/${OLD_CLASSNAME}/${NEW_CLASSNAME}/g $f - ${GP}sed -i s/${OLD_CLASSUPPER}/${NEW_CLASSUPPER}/g $f - ${GP}sed -i s/${OLD_CLASSLOWER}/${NEW_CLASSLOWER}/g $f +echo "replacing in $f..." + ${GP}sed -i "s/\b${OLD_CLASSNAME}\b/${NEW_CLASSNAME}/g" $f + ${GP}sed -i "s/\b${OLD_CLASSUPPER}\b/${NEW_CLASSUPPER}/g" $f + ${GP}sed -i "s/\b${OLD_CLASSLOWER}\b/${NEW_CLASSLOWER}/g" $f done set +e