From c27a6bab51799aab92e23d5453fe85c2789eb655 Mon Sep 17 00:00:00 2001 From: KunoiSayami Date: Tue, 26 Oct 2021 19:18:18 +0800 Subject: fix(script): Fix multiple bugs Signed-off-by: KunoiSayami --- docker/dockerbuild.sh | 7 ++++--- docker/onekey.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/dockerbuild.sh b/docker/dockerbuild.sh index da76650..5ae4880 100755 --- a/docker/dockerbuild.sh +++ b/docker/dockerbuild.sh @@ -2,10 +2,8 @@ set -Eeuo pipefail -#export - cd /home/build -git clone --depth=1 https://github.com/kunoisayami/repos +git clone --depth=3 https://github.com/kunoisayami/repos if [ $UID -eq 0 ]; then @@ -22,6 +20,7 @@ if [ $UID -eq 0 ]; then pushd repo/pod2man su -c 'makepkg -i -s --noconfirm --needed' build popd + su -c 'BUILD_ONLY="" ./pkgbuild.sh' build su -e -c './ci-upload.sh' build @@ -32,7 +31,9 @@ else pushd repo/pod2man makepkg -i -s --noconfirm --needed popd + BUILD_ONLY='' ./pkgbuild.sh + ./ci-upload.sh fi diff --git a/docker/onekey.sh b/docker/onekey.sh index dcccf93..f27153a 100755 --- a/docker/onekey.sh +++ b/docker/onekey.sh @@ -3,7 +3,7 @@ # end up when failed set -Eeuo pipefail -pushd "$(uname -a)" || echo "Can't find your architecture" && exit 0 +pushd "$(uname -m)" || ( echo "Can't find your architecture" && exit 0 ) docker build . -t repobuildbase popd docker build . -t repobuild -- cgit v1.3.1