publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: hardcoded package arch -> detected arch

Browse Source
This commit is contained in:
Dmitry Maksyoma
2021-09-03 19:39:04 +12:00
parent b158f974de
commit b5f8a11ce1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.ci/upload.sh
View File

@@ -17,7 +17,7 @@ function prepare_upload_filename() {
.ci/detect_os_arch_package_format "$package" > /tmp/os_arch_package_format; .ci/detect_os_arch_package_format "$package" > /tmp/os_arch_package_format;
source /tmp/os_arch_package_format; source /tmp/os_arch_package_format;
detect_release_branch detect_release_branch
detect_revision "$package" detect_revision "$package" "$OS_ARCH"
if [ -n "$REVISION" ]; then if [ -n "$REVISION" ]; then
REVISION="_${REVISION}" REVISION="_${REVISION}"
fi fi
@@ -58,10 +58,11 @@ detect_release_branch() {
detect_revision() { detect_revision() {
local package="$1" local package="$1"
local arch="$2"
if ! echo "$package" | grep -q '+'; then if ! echo "$package" | grep -q '+'; then
return return
fi fi
REVISION=$(echo "$package" | sed 's/_amd64.\+//' | sed 's/.\++//') REVISION=$(echo "$package" | sed "s/_${arch}.\+//" | sed 's/.\++//')
} }