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

template stuff for components

master
Theunis J. Botha 2021-09-13 09:39:47 +02:00
parent 9a4a2dbf70
commit 09a05d5992
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r3-libs/r3-v2

@ -1 +1 @@
Subproject commit 3133154ac0ed9ffc520e11cf332149db4b77d417 Subproject commit 4f6b2bf6e2e93e00244c8b902289f53d12c440d7

13
r3.sh
View File

@ -87,7 +87,8 @@ then
echo "updating token.db" echo "updating 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 "\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 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; grep "\bTEMPLATE_[A-Z_]*\b" "${R3_V2_SRC_PATH}"/* -R | sed "s/^.*TEMPLATE_/TEMPLATE_/" | sed "s/\(_START\|_END\)$//" | sort --unique >> "${TEMPLATE_FOLDER}"token.db
exit 1;
fi fi
if [ "${TASK}" = 'create' ] || [ "${TASK}" = 'create-from-update-template' ]; if [ "${TASK}" = 'create' ] || [ "${TASK}" = 'create-from-update-template' ];
@ -283,8 +284,8 @@ then
COMMAND="${commands[$INDEX]}"; COMMAND="${commands[$INDEX]}";
echo "File = ${FILE}"; # echo "File = ${FILE}";
echo "Command = ${COMMAND}"; # echo "Command = ${COMMAND}";
# set -o xtrace # set -o xtrace
@ -302,7 +303,7 @@ then
echo "This ${FILE} is an existing file and will be updated now" echo "This ${FILE} is an existing file and will be updated now"
# shellcheck disable=SC2001 # shellcheck disable=SC2001
COMMAND=$(echo "${COMMAND}" | sed 's/create/create-from-update-template/') COMMAND=$(echo "${COMMAND}" | sed 's/create/create-from-update-template/')
echo "New command is : ${COMMAND}" # echo "New command is : ${COMMAND}"
$COMMAND $COMMAND
RESULT=$? RESULT=$?
if [ "${RESULT}" != 1 ]; if [ "${RESULT}" != 1 ];
@ -322,12 +323,8 @@ then
done done
echo "generating events"
./r3.php all generate-events ./r3.php all generate-events
echo "building distribution"
./r3.php all build-dist ./r3.php all build-dist
cd - 2>&1 || exit 3 cd - 2>&1 || exit 3