From 541eed07a6e760cae08d32303751c47880dbf635 Mon Sep 17 00:00:00 2001 From: clime Date: Mar 09 2018 13:31:30 +0000 Subject: use brace expansion to generate radix digits, fix dirty check position in git archive --- diff --git a/rpkglib/preproc/lib.sh b/rpkglib/preproc/lib.sh index 25fa523..f61aa61 100644 --- a/rpkglib/preproc/lib.sh +++ b/rpkglib/preproc/lib.sh @@ -5,7 +5,7 @@ declare -Ax __cached ############## HELPER FUNCTIONS ############## function encode_decimal { - radixdigits=(a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 8 9) + radixdigits=({a..z} {0..9}) x="$1" result= while [ "$x" -gt 0 ]; do @@ -115,17 +115,17 @@ function git_archive { return 1 fi - if git describe --dirty | grep -q -E '.*-dirty$'; then - log_error "Your working tree is dirty. Commit first." - return 2 - fi - if [ -z "$OUTDIR" ]; then log_debug "OUTDIR is not set. No action taken." output "$source_name" return fi + if git describe --dirty | grep -q -E '.*-dirty$'; then + log_error "Your working tree is dirty. Commit first." + return 2 + fi + if [ -f "$OUTDIR/$source_name" ] && [ -z "$force" ]; then log_info "Source file already exists. No action taken." output "$source_name"