Skip to content

Commit cb4bdb6

Browse files
committed
fix a copy and paste error
1 parent 20f359d commit cb4bdb6

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
__debug_bin
99
frankenphp.test
1010
caddy/frankenphp/Build
11+
package/etc/php.ini
1112
*.log

build-packages.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ fi
5858

5959
mkdir -p package/etc/php.d
6060
mkdir -p package/modules
61-
[ -f source_file ] && cp -f dist/static-php-cli/source/php-src/php.ini-production package/etc/php.ini
61+
[ -f ./dist/static-php-cli/source/php-src/php.ini-production ] && cp -f ./dist/static-php-cli/source/php-src/php.ini-production ./package/etc/php.ini
6262

6363
cd dist
64+
iteration=1
6465
glibc_version=$(ldd -v "$bin" | awk '/GLIBC_/ {gsub(/[()]/, "", $2); print $2}' | grep -v GLIBC_PRIVATE | sort -V | tail -n1)
6566
cxxabi_version=$(strings "$bin" | grep -oP 'CXXABI_\d+\.\d+(\.\d+)?' | sort -V | tail -n1)
6667

@@ -70,7 +71,8 @@ fpm -s dir -t rpm -n frankenphp -v "${FRANKENPHP_VERSION}" \
7071
--depends "libc.so.6(${glibc_version})(64bit)" \
7172
--depends "libstdc++.so.6(${cxxabi_version})(64bit)" \
7273
--after-install ../package/after_install.sh \
73-
"$bin=/usr/bin/frankenphp" \
74+
--iteration "${iteration}"\
75+
"${bin}=/usr/bin/frankenphp" \
7476
"../package/frankenphp.service=/usr/lib/systemd/system/frankenphp.service" \
7577
"../package/Caddyfile=/etc/frankenphp/Caddyfile" \
7678
"../package/etc/php.ini=/etc/frankenphp/php.ini" \
@@ -88,7 +90,8 @@ fpm -s dir -t deb -n frankenphp -v "${FRANKENPHP_VERSION}" \
8890
--depends "libstdc++6 (>= ${cxxabi_version})" \
8991
--deb-suggests libcap2-bin \
9092
--after-install ../package/after_install.sh \
91-
"$bin=/usr/bin/frankenphp" \
93+
--iteration "${iteration}"\
94+
"${bin}=/usr/bin/frankenphp" \
9295
"../package/frankenphp.service=/lib/systemd/system/frankenphp.service" \
9396
"../package/Caddyfile=/etc/frankenphp/Caddyfile" \
9497
"../package/etc/php.ini=/etc/frankenphp/php.ini" \

0 commit comments

Comments
 (0)