From a8dde1600e92c9dcb709f02f879eb80ac8ba7626 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 12 Oct 2020 19:50:47 +0200 Subject: [PATCH] fix package_check --- conf/arm.src.default | 2 +- conf/x86-64.src.default | 2 +- scripts/install | 1 + scripts/restore | 1 + scripts/upgrade | 1 + scripts/upgrade.d/upgrade.last.sh | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conf/arm.src.default b/conf/arm.src.default index 2c535be..f6fd120 100644 --- a/conf/arm.src.default +++ b/conf/arm.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/buster/gitlab-ce___VERSION__-ce.0_armhf.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_armhf.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/conf/x86-64.src.default b/conf/x86-64.src.default index cf7aba5..b33624e 100644 --- a/conf/x86-64.src.default +++ b/conf/x86-64.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/buster/gitlab-ce___VERSION__-ce.0_amd64.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_amd64.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/scripts/install b/scripts/install index f8da9a8..fcf86b9 100644 --- a/scripts/install +++ b/scripts/install @@ -183,6 +183,7 @@ source ./upgrade.d/upgrade.last.sh cp ../conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" +ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/restore b/scripts/restore index bdbfbdd..235d58e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -103,6 +103,7 @@ mkdir -p ../conf/ cp ../settings/conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" +ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/upgrade b/scripts/upgrade index 53fc901..39cb226 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -269,6 +269,7 @@ then cp ../conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index b291b0f..31feb59 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -3,6 +3,7 @@ gitlab_version="13.4.3" # sha256sum found here: https://packages.gitlab.com/gitlab +gitlab_debian_version="buster" gitlab_x86_64_buster_source_sha256="48eea5c92611f695eeacaea6c5cc3f0120465d02f26d03873512fcea7b5f6860"