From 0f0d38a7ba11c4caadaefff1ed101f014dc15c03 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 16 Mar 2019 12:28:47 +0100 Subject: [PATCH] Update update_src_version function --- scripts/install | 13 ++++--------- scripts/restore | 13 ++++--------- scripts/upgrade | 13 ++++--------- 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/scripts/install b/scripts/install index b3ef922..8cbc425 100644 --- a/scripts/install +++ b/scripts/install @@ -122,15 +122,10 @@ ynh_print_info "Setting up source files..." update_src_version() { source ./upgrade.d/upgrade.last.sh - cp ../conf/arm.src.default ../conf/arm.src - ynh_replace_string "__VERSION__" "$gitlab_version" "../conf/arm.src" - ynh_replace_string "__SHA256_SUM__" "$gitlab_arm_source_sha256" "../conf/arm.src" - ynh_replace_string "__SOURCE_FILENAME__" "$gitlab_filename" "../conf/arm.src" - - cp ../conf/x86-64.src.default ../conf/x86-64.src - ynh_replace_string "__VERSION__" "$gitlab_version" "../conf/x86-64.src" - ynh_replace_string "__SHA256_SUM__" "$gitlab_x86_64_source_sha256" "../conf/x86-64.src" - ynh_replace_string "__SOURCE_FILENAME__" "$gitlab_filename" "../conf/x86-64.src" + cp ../conf/$architecture.src.default ../conf/$architecture.src + ynh_replace_string "__VERSION__" "$gitlab_version" "../conf/$architecture.src" + ynh_replace_string "__SHA256_SUM__" "$gitlab_arm_source_sha256" "../conf/$architecture.src" + ynh_replace_string "__SOURCE_FILENAME__" "$gitlab_filename" "../conf/$architecture.src" } update_src_version diff --git a/scripts/restore b/scripts/restore index 4c52e59..8c0eb93 100644 --- a/scripts/restore +++ b/scripts/restore @@ -77,15 +77,10 @@ ynh_print_info "Reinstalling gitlab..." update_src_version() { source ../settings/scripts/upgrade.d/upgrade.last.sh mkdir -p ../conf/ - cp ../settings/conf/arm.src.default ../conf/arm.src - ynh_replace_string "__VERSION__" "$gitlab_version" "../conf/arm.src" - ynh_replace_string "__SHA256_SUM__" "$gitlab_arm_source_sha256" "../conf/arm.src" - ynh_replace_string "__SOURCE_FILENAME__" "$gitlab_filename" "../conf/arm.src" - - cp ../conf/x86-64.src.default ../conf/x86-64.src - ynh_replace_string "__VERSION__" "$gitlab_version" "../conf/x86-64.src" - ynh_replace_string "__SHA256_SUM__" "$gitlab_x86_64_source_sha256" "../conf/x86-64.src" - ynh_replace_string "__SOURCE_FILENAME__" "$gitlab_filename" "../conf/x86-64.src" + cp ../settings/conf/$architecture.src.default ../conf/$architecture.src + ynh_replace_string "__VERSION__" "$gitlab_version" "../conf/$architecture.src" + ynh_replace_string "__SHA256_SUM__" "$gitlab_arm_source_sha256" "../conf/$architecture.src" + ynh_replace_string "__SOURCE_FILENAME__" "$gitlab_filename" "../conf/$architecture.src" } update_src_version diff --git a/scripts/upgrade b/scripts/upgrade index 651bf7b..3b3eb5f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -161,15 +161,10 @@ ynh_print_info "Setting up source files..." update_src_version() { source ./upgrade.d/upgrade.last.sh - cp ../conf/arm.src.default ../conf/arm.src - ynh_replace_string "__VERSION__" "$gitlab_version" "../conf/arm.src" - ynh_replace_string "__SHA256_SUM__" "$gitlab_arm_source_sha256" "../conf/arm.src" - ynh_replace_string "__SOURCE_FILENAME__" "$gitlab_filename" "../conf/arm.src" - - cp ../conf/x86-64.src.default ../conf/x86-64.src - ynh_replace_string "__VERSION__" "$gitlab_version" "../conf/x86-64.src" - ynh_replace_string "__SHA256_SUM__" "$gitlab_x86_64_source_sha256" "../conf/x86-64.src" - ynh_replace_string "__SOURCE_FILENAME__" "$gitlab_filename" "../conf/x86-64.src" + cp ../conf/$architecture.src.default ../conf/$architecture.src + ynh_replace_string "__VERSION__" "$gitlab_version" "../conf/$architecture.src" + ynh_replace_string "__SHA256_SUM__" "$gitlab_arm_source_sha256" "../conf/$architecture.src" + ynh_replace_string "__SOURCE_FILENAME__" "$gitlab_filename" "../conf/$architecture.src" } update_src_version