diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2022-05-18 10:20:34 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2022-05-18 10:20:34 +0200 |
| commit | cac31f9325af1030883f9882b0b1b8f07be2c77c (patch) | |
| tree | f53bb29eeecd4650239f0d2341cc1c7824418696 | |
| parent | Fix parsing of scram password from prosody (diff) | |
make-packages: Include systemd unit with RPM
Don't forget to include the /etc/systemd/system/ejabberd.service unit
with the RPM package.
Closes #3816.
| -rwxr-xr-x | tools/make-packages | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/make-packages b/tools/make-packages index 6a665ef90..0d8d2248e 100755 --- a/tools/make-packages +++ b/tools/make-packages @@ -160,9 +160,10 @@ make_package() { local output_type="$1" local architecture="$(package_architecture "$2")" - local dir="$3" + local work_dir="$3" + local include_dirs="$4" - cd "$dir" # FPM's "--chdir" option doesn't work (as I'd expect). + cd "$work_dir" # FPM's "--chdir" option doesn't work (as I'd expect). fpm --output-type "$output_type" \ --input-type 'dir' \ --name "$rel_name" \ @@ -194,7 +195,7 @@ make_package() --before-upgrade './before-install' \ --after-upgrade './after-upgrade' \ --after-remove './after-remove' \ - './opt' './usr' + $include_dirs cd "$OLDPWD" } @@ -228,10 +229,10 @@ do "$etc_dir/systemd/system/$rel_name.service" "$arch_dir/$rel_name" create_scripts "$arch_dir" - make_package 'rpm' "$arch" "$arch_dir" + make_package 'rpm' "$arch" "$arch_dir" './opt ./usr ./etc' mv "$etc_dir/systemd/system/$rel_name.service" "$arch_dir" rm -r "$etc_dir" - make_package 'deb' "$arch" "$arch_dir" + make_package 'deb' "$arch" "$arch_dir" './opt ./usr' mv "$arch_dir/$rel_name"?$rel_vsn*.??? . done echo "$myself: Created DEB and RPM packages successfully." |