diff --git a/meson.build b/meson.build index 89dc05f..16841d5 100644 --- a/meson.build +++ b/meson.build @@ -73,6 +73,7 @@ global_conf.set('REPO_URL', upstream_repo) subdir('data') subdir('po') subdir('src') +subdir('scripts') gnome.post_install( gtk_update_icon_cache: true, diff --git a/scripts/meson.build b/scripts/meson.build new file mode 100644 index 0000000..0b36eb6 --- /dev/null +++ b/scripts/meson.build @@ -0,0 +1,4 @@ +install_data('_clone_or_pull.sh', install_dir: pkgdatadir / 'scripts') +install_data('build_libsurvive.sh', install_dir: pkgdatadir / 'scripts') +install_data('build_monado.sh', install_dir: pkgdatadir / 'scripts') +install_data('build_opencomposite.sh', install_dir: pkgdatadir / 'scripts') diff --git a/src/builders/build_libsurvive.rs b/src/builders/build_libsurvive.rs index 83a9530..d5c9fdc 100644 --- a/src/builders/build_libsurvive.rs +++ b/src/builders/build_libsurvive.rs @@ -1,10 +1,10 @@ -use crate::{profile::Profile, runner::Runner}; +use crate::{profile::Profile, runner::Runner, constants::PKG_DATA_DIR}; use expect_dialog::ExpectDialog; pub fn get_build_libsurvive_runner(profile: Profile) -> Runner { let runner = Runner::new( None, - "./scripts/build_libsurvive.sh".into(), + format!("{sysdata}/scripts/build_libsurvive.sh", sysdata = PKG_DATA_DIR), vec![ profile .libsurvive_path diff --git a/src/builders/build_monado.rs b/src/builders/build_monado.rs index 4eb97ce..e0d0b53 100644 --- a/src/builders/build_monado.rs +++ b/src/builders/build_monado.rs @@ -1,9 +1,9 @@ -use crate::{runner::Runner, profile::Profile}; +use crate::{runner::Runner, profile::Profile, constants::PKG_DATA_DIR}; pub fn get_build_monado_runner(profile: Profile) -> Runner { let runner = Runner::new( None, - "./scripts/build_monado.sh".into(), + format!("{sysdata}/scripts/build_monado.sh", sysdata = PKG_DATA_DIR), vec![ profile.monado_path, profile.prefix, diff --git a/src/builders/build_opencomposite.rs b/src/builders/build_opencomposite.rs index ddca54d..206b1ab 100644 --- a/src/builders/build_opencomposite.rs +++ b/src/builders/build_opencomposite.rs @@ -1,9 +1,9 @@ -use crate::{profile::Profile, runner::Runner}; +use crate::{profile::Profile, runner::Runner, constants::PKG_DATA_DIR}; pub fn get_build_opencomposite_runner(profile: Profile) -> Runner { let runner = Runner::new( None, - "./scripts/build_opencomposite.sh".into(), + format!("{sysdata}/scripts/build_opencomposite.sh", sysdata = PKG_DATA_DIR), vec![ profile.opencomposite_path, ]