From 30a9e1e7833d30fa026538a53c01490146487bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@bmi.gv.at>
Date: Fri, 13 Sep 2024 16:25:08 +0200
Subject: [PATCH] change deploy-aliases

---
 aliases        | 2 +-
 aliases_remote | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/aliases b/aliases
index e988bf3..f535861 100644
--- a/aliases
+++ b/aliases
@@ -7,7 +7,7 @@ alias apv="ansible-playbook --ask-vault-pass"
 
 alias fuck='sudo $(history -p \!\!)'
 alias wosis='which $(history -p \!\!)' 
-alias fix='reset; stty sane; tput rs1; clear; echo -e "\033c"' # Fix terminal aber binary output
+alias fix='reset; stty sane; tput rs1; clear; echo -e "\033c"; printf "\033[3J"' # Fix terminal aber binary output
 alias fixbmi='fixtoken; ssh -Oexit svras' # Fix terminal aber binary output
 alias fixtoken='sudo systemctl restart pcscd.service' # Fix terminal aber binary output
 # Source https://www.digitalocean.com/community/tutorials/how-to-use-bash-history-commands-and-expansions-on-a-linux-vps
diff --git a/aliases_remote b/aliases_remote
index 8d13e2d..94be7a3 100644
--- a/aliases_remote
+++ b/aliases_remote
@@ -1,4 +1,5 @@
-alias deploypvp='getatsvc; TARGETDIR=/opt/atlassian/${APP_NAME}/${APP_INST_NAME}/WEB-INF/lib; COMCSV=$(ls -t /root/INSTALL/commons-csv* |head -n1); SETTINGS=$(ls -t /root/INSTALL/at.gv.bmi.atlassian.pvp.settings* |head -n1); PVP=$(ls -t /root/INSTALL/at.gv.bmi.atlassian.pvp.authenticator.*${SVC}* |head -n1); CHARDET=$(ls -t /root/INSTALL/juniversalchardet*|head -n1); echo "Deploy $SETTINGS $PVP $COMCSV" "$CHARDET"; systemctl stop ${APP_NAME}.service ;"${TARGETDIR}"/at.gv.bmi.* "${TARGETDIR}"/"$(basename $CHARDET)" "${TARGETDIR}"/"$(basename $COMCSV)"; cp "${SETTINGS}" "${PVP}" "${COMCSV}" "${CHARDET}" "${TARGETDIR}"/.; systemctl restart ${APP_NAME} --no-block ;tailatpvp'
-alias deploypvpandstop='getatsvc; TARGETDIR=/opt/atlassian/${APP_NAME}/${APP_INST_NAME}/WEB-INF/lib; COMCSV=$(ls -t /root/INSTALL/commons-csv* |head -n1); SETTINGS=$(ls -t /root/INSTALL/at.gv.bmi.atlassian.pvp.settings* |head -n1); PVP=$(ls -t /root/INSTALL/at.gv.bmi.atlassian.pvp.authenticator.*${SVC}* |head -n1); CHARDET=$(ls -t /root/INSTALL/juniversalchardet*|head -n1); echo "Deploy $SETTINGS $PVP $COMCSV $CHARDET"; systemctl stop ${APP_NAME}.service ;rm "${TARGETDIR}"/at.gv.bmi.* "${TARGETDIR}"/"$(basename $CHARDET)" "${TARGETDIR}"/"$(basename $COMCSV)"; cp "${SETTINGS}" "${PVP}" "${COMCSV}" "${CHARDET}" ${TARGETDIR}/.'
+#alias deploypvp='getatsvc; TARGETDIR=/opt/atlassian/${APP_NAME}/${APP_INST_NAME}/WEB-INF/lib; COMCSV=$(ls -t /root/INSTALL/commons-csv* |head -n1); SETTINGS=$(ls -t /root/INSTALL/at.gv.bmi.atlassian.pvp.settings* |head -n1); PVP=$(ls -t /root/INSTALL/at.gv.bmi.atlassian.pvp.authenticator.*${SVC}* |head -n1); CHARDET=$(ls -t /root/INSTALL/juniversalchardet*|head -n1); echo "Deploy $SETTINGS $PVP $COMCSV" "$CHARDET"; systemctl stop ${APP_NAME}.service ;"${TARGETDIR}"/at.gv.bmi.* "${TARGETDIR}"/"$(basename $CHARDET)" "${TARGETDIR}"/"$(basename $COMCSV)"; cp "${SETTINGS}" "${PVP}" "${COMCSV}" "${CHARDET}" "${TARGETDIR}"/.; systemctl restart ${APP_NAME} --no-block ;tailatpvp'
+#alias deploypvpandstop='getatsvc; TARGETDIR=/opt/atlassian/${APP_NAME}/${APP_INST_NAME}/WEB-INF/lib; COMCSV=$(ls -t /root/INSTALL/commons-csv* |head -n1); SETTINGS=$(ls -t /root/INSTALL/at.gv.bmi.atlassian.pvp.settings* |head -n1); PVP=$(ls -t /root/INSTALL/at.gv.bmi.atlassian.pvp.authenticator.*${SVC}* |head -n1); CHARDET=$(ls -t /root/INSTALL/juniversalchardet*|head -n1); echo "Deploy $SETTINGS $PVP $COMCSV $CHARDET"; systemctl stop ${APP_NAME}.service ;rm "${TARGETDIR}"/at.gv.bmi.* "${TARGETDIR}"/"$(basename $CHARDET)" "${TARGETDIR}"/"$(basename $COMCSV)"; cp "${SETTINGS}" "${PVP}" "${COMCSV}" "${CHARDET}" ${TARGETDIR}/.'
+alias deploypvp='getatsvc; TARGETDIR=/opt/atlassian/${APP_NAME}/${APP_INST_NAME}/WEB-INF/lib; COMCSV=$(ls -t /root/INSTALL/commons-csv* |head -n1); SETTINGS=$(ls -t /root/INSTALL/at.gv.bmi.atlassian.pvp.settings* |head -n1); PVP=$(ls -t /root/INSTALL/at.gv.bmi.atlassian.pvp.authenticator.*${SVC}* |head -n1); TIKA_CORE=$(ls -t /root/INSTALL/tika-core*|head -n1); TIKA_PARS=$(ls -t /root/INSTALL/tika-parsers-standard-package*|head -n1); TIKA_PARS_TEXT=$(ls -t /root/INSTALL/tika-parser-text-module*|head -n1); echo "Deploy $SETTINGS $PVP $COMCSV" "$TIKA_CORE" "$TIKA_PARS" "$TIKA_PARS"; systemctl stop ${APP_NAME}.service ;"${TARGETDIR}"/at.gv.bmi.* "${TARGETDIR}"/"$(basename $TIKA_CORE)" "${TARGETDIR}"/"$(basename $TIKA_PARS)" "${TARGETDIR}"/"$(basename $TIKA_PARS_TEXT)" "${TARGETDIR}"/"$(basename $COMCSV)"; cp "${SETTINGS}" "${PVP}" "${COMCSV}" "${TIKA_CORE}" "${TIKA_PARS}" "${TIKA_PARS_TEXT}" "${TARGETDIR}"/.; systemctl restart ${APP_NAME} --no-block ;tailatpvp'
 alias getpvpversion='for base in $(find /opt/atlassian -type d -name "WEB-INF"); do echo search in "$base"; find "${base}/lib" -name "*pvp*" -exec basename  {} \; ; echo "---";done'