Skip to content

Commit

Permalink
adapt tar_options handling
Browse files Browse the repository at this point in the history
The original tar_options=$tar_options statement was noop. Align the
behavior to match other options handling.
  • Loading branch information
joufellasfl committed Mar 12, 2023
1 parent bd8c94b commit b97ca6a
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions cqfd
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,9 @@ make_archive() {
tar_opts='--transform s/.*\///g'
fi

# setting tar_options will add the following options to the tar
# command
if [ -n "$tar_options" ]; then
tar_opts="$tar_opts $tar_options"
# setting tar_options=x will pass the options to tar
if [ "$release_tar_opts" ]; then
tar_opts+=" $release_tar_opts"
fi

# support the following archive formats
Expand Down Expand Up @@ -385,7 +384,7 @@ config_load() {
release_files="$files"
release_archive="$archive"
release_transform="$tar_transform"
tar_options="$tar_options"
release_tar_opts="$tar_options"

dockerfile="${cqfddir}/${distro:-docker}/Dockerfile"

Expand Down

0 comments on commit b97ca6a

Please sign in to comment.