diff --git a/manifest.json b/manifest.json index aa7e0a4..5d46125 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.2.3" }, "multi_instance": false, "services": [ diff --git a/scripts/install b/scripts/install index 523f82b..100b98c 100755 --- a/scripts/install +++ b/scripts/install @@ -102,17 +102,17 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Setting up source files..." update_src_version() { - source ./upgrade.d/upgrade.last.sh - cp ../conf/$architecture.src.default ../conf/$architecture.src - ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_runner_version" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_runner_filename" --target_file="../conf/$architecture.src" + source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh + cp $YNH_APP_BASEDIR/conf/$architecture.src.default $YNH_APP_BASEDIR/conf/$architecture.src + ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_runner_version" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" + ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_runner_filename" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" if [ $architecture = "x86-64" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_x86_64_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_x86_64_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" elif [ $architecture = "i386" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_i386_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_i386_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" elif [ $architecture = "arm" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_arm_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_arm_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" fi } diff --git a/scripts/restore b/scripts/restore index 431e707..4d21a24 100755 --- a/scripts/restore +++ b/scripts/restore @@ -65,18 +65,17 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Reinstalling GitLab Runner..." update_src_version() { - source ../settings/scripts/upgrade.d/upgrade.last.sh - mkdir -p ../conf/ - cp ../settings/conf/$architecture.src.default ../conf/$architecture.src - ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_runner_version" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_runner_filename" --target_file="../conf/$architecture.src" + source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh + cp $YNH_APP_BASEDIR/conf/$architecture.src.default $YNH_APP_BASEDIR/conf/$architecture.src + ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_runner_version" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" + ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_runner_filename" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" if [ $architecture = "x86-64" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_x86_64_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_x86_64_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" elif [ $architecture = "i386" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_i386_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_i386_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" elif [ $architecture = "arm" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_arm_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_arm_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" fi } diff --git a/scripts/upgrade b/scripts/upgrade index 160e5b6..4b83a54 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,17 +47,17 @@ ynh_abort_if_errors ynh_script_progression --message="Upgrading source files..." update_src_version() { - source ./upgrade.d/upgrade.last.sh - cp ../conf/$architecture.src.default ../conf/$architecture.src - ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_runner_version" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_runner_filename" --target_file="../conf/$architecture.src" + source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh + cp $YNH_APP_BASEDIR/conf/$architecture.src.default $YNH_APP_BASEDIR/conf/$architecture.src + ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_runner_version" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" + ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_runner_filename" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" if [ $architecture = "x86-64" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_x86_64_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_x86_64_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" elif [ $architecture = "i386" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_i386_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_i386_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" elif [ $architecture = "arm" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_arm_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_arm_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" fi }