various fixes

debian/meson.build

@@ -38,7 +38,7 @@ debian_rules = configure_file (
   )
 
 debian_pkg_filename = run_command (
-  get_pkg_filename, 'DEBIAN').stdout ().strip ()
+  get_pkg_filename, 'DEBIAN', dash_trial).stdout ().strip ()
 debian_pkg = custom_target (
   'debian-pkg',
   output: debian_pkg_filename,

meson.build

@@ -51,6 +51,7 @@ temp_zplugins_suffix = 'lib/lv2'
 temp_zplugins_dir = temp_zplugins_prefix / temp_zplugins_suffix
 temp_library_prefix = meson.build_root () / 'tmp_lib_prefix'
 temp_library_pkgconfig_path = temp_library_prefix / libdir / 'pkgconfig'
+dash_trial = build_trial ? '-trial' : ''
 
 global_conf = configuration_data ()
 global_conf.set ('PREFIX', prefix)
@@ -87,8 +88,7 @@ global_conf.set (
   'TEMP_CARLA_PREFIX', temp_carla_prefix)
 global_conf.set (
   'TEMP_CARLA_PKG_CONFIG_PATH', temp_carla_pkgconfig_path)
-global_conf.set (
-  'DASH_TRIAL', build_trial ? '-trial' : '')
+global_conf.set ('DASH_TRIAL', dash_trial)
 global_conf.set (
   'TRIAL_TRUE_FALSE', build_trial ? 'true' : 'false')
 global_conf.set (

scripts/get_pkg_filename.sh.in

@@ -4,7 +4,7 @@
 pkg_type="$1"
 
 # "-trial" if trial
-trial="@DASH_TRIAL@"
+trial="$2"
 
 zrythm_pkg_ver=@ZRYTHM_PKG_VERSION@
 

scripts/make_carla.sh.in

@@ -1,6 +1,6 @@
 #!@BASH@
 
-set -x
+set -e
 
 # full path to carla source zip
 carla_source_zip="$1"

scripts/make_debian_pkg.sh.in

@@ -1,6 +1,6 @@
 #!@BASH@
 
-set -xe
+set -e
 
 out_pkg="$1"
 
@@ -34,7 +34,7 @@ echo "3.0 (native)" > $deb_src_dir/format
 tar -xzf $deb_source_tarball -C $tempdir
 
 pushd $deb_parent_dir
-debuild -us -uc 
+debuild -us -uc
 popd
 
 mv $tempdir/*.deb "$out_pkg"

scripts/make_lsp_dsp_lib.sh.in

@@ -1,5 +1,7 @@
 #!@BASH@
 
+set -e
+
 tarball=$1
 
 lsp_dsp_lib_ver="@LSP_DSP_LIB_VER@"
@@ -11,6 +13,6 @@ tempdir=`mktemp -d`
 tar xf $tarball -C $tempdir
 ls -l "$tempdir"
 cd "$tempdir/lsp-dsp-lib"
-make config PREFIX=$temp_lib_prefix LIBDIR=$temp_lib_prefix/@LIBDIR@
+make config PREFIX=$temp_lib_prefix
 make -j4 && make install
 rm -rf $tempdir