Browse Source

fix trial building

use_builds_script
Alexandros Theodotou 2 years ago
parent
commit
3902e0ba96
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 2
      gnu-linux/installer.sh.in
  2. 5
      gnu-linux/make_installer_zip.sh.in
  3. 2
      gnu-linux/meson.build

2
gnu-linux/installer.sh.in

@ -149,7 +149,7 @@ else @@ -149,7 +149,7 @@ else
fi
# install packages
prefix="bin/$distro_identifier/zrythm-$zrythm_ver"
prefix="bin/$distro_identifier/zrythm$dash_trial-$zrythm_ver"
if [ $proceed -ne 0 ]; then
if [[ $distro_identifier = "ubuntu"* ]] || [[ $distro_identifier = "debian"* ]]; then
ask_for_root_pw;

5
gnu-linux/make_installer_zip.sh.in

@ -16,6 +16,7 @@ zip_inner_dir_name="${zip_filename%.*}" @@ -16,6 +16,7 @@ zip_inner_dir_name="${zip_filename%.*}"
zip_inner_dir="$private_dir/$zip_inner_dir_name"
zrythm_version="@ZRYTHM_PKG_VERSION@"
pdf_dir="@PDF_DIR@"
dash_trial="@DASH_TRIAL@"
rm -rf $out_file
rm -rf $private_dir
@ -33,7 +34,7 @@ get_package_filename () { @@ -33,7 +34,7 @@ get_package_filename () {
# returns the filename to be placed inside "bin"
get_dest_package_filename () {
prefix="zrythm-$zrythm_version"
prefix="zrythm$dash_trial-$zrythm_version"
distro=$1
res=""
case "$distro" in
@ -51,7 +52,7 @@ get_dest_package_filename () { @@ -51,7 +52,7 @@ get_dest_package_filename () {
copy_package () {
distro=$1
src_pkg_filename="$(get_package_filename $distro)"
src_pkg_filename="$(get_package_filename $distro $dash_trial)"
dest_pkg_filename="$(get_dest_package_filename $distro)"
distro_bin_dir="$zip_inner_dir/bin/$distro"
mkdir -p "$distro_bin_dir"

2
gnu-linux/meson.build

@ -38,7 +38,7 @@ readme = configure_file ( @@ -38,7 +38,7 @@ readme = configure_file (
)
installer_zip_filename = run_command (
get_pkg_filename_from_distro, get_option ('distro')).stdout ().strip ()
get_pkg_filename_from_distro, get_option ('distro'), dash_trial).stdout ().strip ()
installer_zip = custom_target (
'gnu-linux-installer-zip',
output: installer_zip_filename,

Loading…
Cancel
Save