From d93818eb87a43d2ecba30963a8d4eed4ca6a219b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?= Date: Fri, 4 May 2018 16:58:18 +0200 Subject: [PATCH] Ensure to remove update information if upgraded --- jenkins_check_update | 2 +- jenkins_update_plugins | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jenkins_check_update b/jenkins_check_update index d43d7f4..96bf878 100755 --- a/jenkins_check_update +++ b/jenkins_check_update @@ -33,7 +33,7 @@ then touch "${JENKINS_PLUGIN_UPDATE_LOG}" #printf '%b\n' "Please upgrade plugins" else - rm -f "${JENKINS_PLUGIN_UPDATE_LOG}" + rm -f -- "${JENKINS_PLUGIN_UPDATE_LOG}" #printf '%b\n' "Nothing to do" fi cd - > /dev/null || exit diff --git a/jenkins_update_plugins b/jenkins_update_plugins index a5ca708..8a9f122 100755 --- a/jenkins_update_plugins +++ b/jenkins_update_plugins @@ -14,6 +14,7 @@ JENKINS_CLI_JAR="${JENKINS_HOME}/war/WEB-INF/jenkins-cli.jar" JENKINS_AUTH_FILE="/root/.jenkins.auth" JENKINS_PLUGIN_LIST_FILE="${JENKINS_HOME}/updates/.plugin_list.$(date +%Y%m%d)" +JENKINS_PLUGIN_UPDATE_LOG="${JENKINS_HOME}/.update_plugin" if [ ! -f "${JENKINS_CLI_JAR}" ]; then printf '%b\n' "Jenkins-cli (${JENKINS_CLI_JAR}) does not seem to be available." @@ -54,5 +55,6 @@ cd - > /dev/null || exit # Purge "log" files older than 30 days find "${JENKINS_HOME}/updates" -iname ".plugin_list*" -mtime +30 -delete +rm -f -- "${JENKINS_PLUGIN_UPDATE_LOG}" exit 0