From 1b0948ca23bdf3566c514c93e369c16c8ee8512a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 18 Mar 2023 22:53:47 +0100 Subject: [PATCH] fix --- manifest.toml | 8 -------- scripts/install | 4 +++- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/manifest.toml b/manifest.toml index 03903ce..a197599 100644 --- a/manifest.toml +++ b/manifest.toml @@ -72,14 +72,6 @@ ram.runtime = "50M" url = "https://github.com/jech/galene-ldap/archive/33b8a930372388b2b8b506d2564516fb3eaf895a.tar.gz" sha256 = "00247712e4e7944fed42026f056f48eb59a95cf476c3ff1cb6e24c54469ce070" - [resources.sources.generator] - url = "https://www.irif.fr/~jch/software/files/galene-password-generator-linux-amd64.gz" - sha256 = "a7fccbfa54c82e2e7ada0491364b41f5604ae85fe41b0501a592465e758f8cc4" - #arm64.url = "https://www.irif.fr/~jch/software/files/galene-password-generator-linux-arm64.gz" - #arm64.sha256 = "7e2e354438321b331f10779d700fc84ee3542f77b1142da9f90c8bbc7aa2680a" - in_subdir = false - rename = "galene-password-generator" - [resources.system_user] [resources.install_dir] diff --git a/scripts/install b/scripts/install index 3fd736c..1af0078 100755 --- a/scripts/install +++ b/scripts/install @@ -45,7 +45,6 @@ ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir/build" ynh_setup_source --dest_dir="$install_dir/build_ldap" --source_id="ldap" -ynh_setup_source --dest_dir="$install_dir" --source_id="generator" mkdir -p "$install_dir/live/data" mkdir -p "$install_dir/live_ldap/data" @@ -73,6 +72,9 @@ ynh_script_progression --message="Building app..." --weight=1 ynh_exec_warn_less ynh_install_go --go_version=$go_version ynh_use_go +pushd $install_dir/build/galene-password-generator/ + ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -o $install_dir/ +popd pushd $install_dir/build/ ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live/ popd