From 787c4c5b2fde70ce1c0a82ee1b866ab226c6d5c7 Mon Sep 17 00:00:00 2001 From: Trey Blancher Date: Mon, 2 Oct 2023 16:44:26 -0400 Subject: [PATCH] Fixed lots of issues when trying to pack previous months --- month-pack.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/month-pack.sh b/month-pack.sh index a543224..9a4ebec 100755 --- a/month-pack.sh +++ b/month-pack.sh @@ -2,14 +2,14 @@ PATH=/Users/tblancher/homebrew/opt/coreutils/libexec/gnubin:/Users/tblancher/homebrew/opt/gnu-tar/libexec/gnubin:/Users/tblancher/bin:/Users/tblancher/homebrew/bin:/Users/tblancher/homebrew/sbin:/Users/tblancher/gem/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/sbin:/usr/sbin:/Users/tblancher/bin -if [ "x$1" == "x" ]; then +if [[ -z "$1" ]]; then MONTH=$(( $(date +%-m) - 1 )) else MONTH=$1 shift fi -if [ "x$1" == "x" ]; then +if [[ -z "$1" ]]; then YEAR=$(date +%Y) CURR=1 else @@ -19,18 +19,18 @@ else fi -if [ $MONTH -eq 0 ]; +if [[ "$MONTH" -eq 0 ]]; then MONTH=12 fi -if [ ${CURR} -eq 1 ] && [ $(( $(date +%-m) - $MONTH )) -le 0 ]; then - YEAR=$(( $YEAR - 1)) +if [[ "${CURR}" -eq 1 ]] && [[ $(( $(date +%-m) - MONTH )) -le 0 ]]; then + YEAR=$(( YEAR - 1)) fi -if [ $MONTH -lt 10 ]; +if [ "$MONTH" -lt 10 ]; then MONTH=0$MONTH fi -tar -cvJf $YEAR-$MONTH.tar.xz $YEAR-$MONTH-*.log --remove-files +tar -cvJf $YEAR-$MONTH.tar.xz $YEAR-$MONTH-*.log --remove-files