diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml deleted file mode 100644 index 51b0369d1..000000000 --- a/.github/workflows/ruby.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Ruby -on: - push: - branches: [main] - pull_request: - branches: [main] - -jobs: - test: - runs-on: ubuntu-22.04 - strategy: - matrix: - ruby-version: ['2.7', '3.0', '3.1', '3.4'] - steps: - - run: | - sudo apt-get update - sudo apt install -y libarchive-tools lintian cpanminus - - uses: actions/checkout@v3 - - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby-version }} - bundler-cache: true # runs 'bundle install' and caches installed gems automatically - - run: | - if [ ! -z "$RUNNER_DEBUG" ] ; then - DEBUG=1 bundle exec rspec -fd - else - bundle exec rspec - fi - env: - SHELL: /usr/bin/bash diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4d20b8cbe..7a111d5cd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Release Notes and Change Log ============================ +1.17.1 (October 30, 2025) TJ Fork +^^^^^^^^^^^^^^^^^^^^^^^^ + +* Filter newer style bash functions out of shell script template's .install-metadata file. + 1.17.0 (October 2, 2025) ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/lib/fpm/version.rb b/lib/fpm/version.rb index 9ee9767f0..1e7cda228 100644 --- a/lib/fpm/version.rb +++ b/lib/fpm/version.rb @@ -1,3 +1,3 @@ module FPM - VERSION = "1.17.0" + VERSION = "1.17.1" end diff --git a/templates/sh.erb b/templates/sh.erb index 4671dfba1..e4fa1264d 100644 --- a/templates/sh.erb +++ b/templates/sh.erb @@ -137,7 +137,7 @@ function save_environment(){ # just piping env to a file doesn't quote the variables. This does # filter out multiline junk, _, and functions. _ is a readonly variable. - env | grep -v "^_=" | grep -v "^[^=(]*()=" | egrep "^[^ ]+=" | while read ENVVAR ; do + env | grep -v "^_=" | grep -v "^[^=(]*()=" | grep -v "^BASH_FUNC_.*%%=" |egrep "^[^ ]+=" | while read ENVVAR ; do local NAME=${ENVVAR%%=*} # sed is to preserve variable values with dollars (for escaped variables or $() style command replacement), # and command replacement backticks