cybafelo
/
r3-cloud
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renamed generated

master
Theunis J. Botha 2021-09-06 08:00:13 +02:00
parent 13f571db1f
commit 981e32949b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r3-libs/r3-v2

@ -1 +1 @@
Subproject commit 3402c7a89174270a359a86512bc3d8d3ddef97d3
Subproject commit 8d6a1d9d36b64ab7378d8026798ce2e986959017

8
r3.sh
View File

@ -83,7 +83,7 @@ cd "${R3_INSTALL_PATH}" 2>&1 || exit 2
if [ "${TASK}" = 'update-token-db' ];
then
echo "updating token.db"
grep "\bGENERATE_[A-Z_]*\b" "${R3_V2_SRC_PATH}"/* -R | sed "s/^.*GENERATE_/GENERATE_/" | sed "s/\(_START\|_END\)$//" | sort --unique > "${TEMPLATE_FOLDER}"token.db
grep "\bGENERATED_[A-Z_]*\b" "${R3_V2_SRC_PATH}"/* -R | sed "s/^.*GENERATED_/GENERATED_/" | sed "s/\(_START\|_END\)$//" | sort --unique > "${TEMPLATE_FOLDER}"token.db
grep "\bCUSTOM_[A-Z_]*\b" "${R3_V2_SRC_PATH}"/* -R | sed "s/^.*CUSTOM_/CUSTOM_/" | sed "s/\(_START\|_END\)$//" | sort --unique >> "${TEMPLATE_FOLDER}"token.db
exit 0;
fi
@ -91,7 +91,7 @@ fi
if [ "${TASK}" = 'create' ];
then
# echo "updating token.db"
# grep "GENERATE_.*_START" "${TEMPLATE_FOLDER}"*.template "${R3_FOLDER}"*.js "${R3_SYSTEM_FOLDER}"*.js -R | sed "s/^.*GENERATE_/GENERATE_/" | sed "s/_START$//" | sort --unique > "${TEMPLATE_FOLDER}"token.db
# grep "GENERATED_.*_START" "${TEMPLATE_FOLDER}"*.template "${R3_FOLDER}"*.js "${R3_SYSTEM_FOLDER}"*.js -R | sed "s/^.*GENERATED_/GENERATED_/" | sed "s/_START$//" | sort --unique > "${TEMPLATE_FOLDER}"token.db
# grep "CUSTOM_.*_START" "${TEMPLATE_FOLDER}"*.template "${R3_FOLDER}"*.js "${R3_SYSTEM_FOLDER}"*.js -R | sed "s/^.*CUSTOM_/CUSTOM_/" | sed "s/_START$//" | sort --unique >> "${TEMPLATE_FOLDER}"token.db
CLASS_NAME=$ARG1
@ -167,12 +167,12 @@ then
perl -p -i -e 's/^const Utils.*\n$//' "${R3_FOLDER}${FILE_NAME}"
fi
grep 'GENERATE_' < "${TEMPLATE_FOLDER}"token.db | sed "s/^.*GENERATE/GENERATE/" | while IFS= read -r TOKEN
grep 'GENERATED_' < "${TEMPLATE_FOLDER}"token.db | sed "s/^.*GENERATE/GENERATE/" | while IFS= read -r TOKEN
do
START_TOKEN="${TOKEN}_START"
END_TOKEN="${TOKEN}_END"
TEMPLATE=$(echo "${TOKEN}.template" | sed "s/^GENERATE_//" | awk '{print tolower($0)}')
TEMPLATE=$(echo "${TOKEN}.template" | sed "s/^GENERATED_//" | awk '{print tolower($0)}')
if grep -q "${START_TOKEN}" "${R3_FOLDER}${FILE_NAME}"; then