瀏覽代碼

Merge pull request #2883 from ntimo/task/updater-diff-to-sub-directory

[Updater] Save diff files into subdirectory
André Peters 6 年之前
父節點
當前提交
e6f3261a29
共有 2 個文件被更改,包括 5 次插入2 次删除
  1. 1 1
      .gitignore
  2. 4 1
      update.sh

+ 1 - 1
.gitignore

@@ -33,7 +33,7 @@ data/conf/portainer/
 data/gitea/
 data/gogs/
 data/conf/sogo/plist_ldap
-diff_before_update_*
+update_diffs/
 .github/
 docker-compose.override.yml
 refresh_images.sh

+ 4 - 1
update.sh

@@ -328,8 +328,11 @@ if [[ ! "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
   exit 0
 fi
 
-DIFF_FILE=diff_before_update_$(date +"%Y-%m-%d-%H-%M-%S")
+DIFF_DIRECTORY=update_diffs
+DIFF_FILE=${DIFF_DIRECTORY}/diff_before_update_$(date +"%Y-%m-%d-%H-%M-%S")
 echo -e "\e[32mSaving diff to ${DIFF_FILE}...\e[0m"
+mkdir -p ${DIFF_DIRECTORY}
+mv diff_before_update* ${DIFF_DIRECTORY}/ 2> /dev/null
 git diff --stat > ${DIFF_FILE}
 git diff >> ${DIFF_FILE}