aboutsummaryrefslogtreecommitdiff
path: root/docker/dockerbuild.sh
diff options
context:
space:
mode:
Diffstat (limited to 'docker/dockerbuild.sh')
-rwxr-xr-xdocker/dockerbuild.sh13
1 files changed, 4 insertions, 9 deletions
diff --git a/docker/dockerbuild.sh b/docker/dockerbuild.sh
index ec933f5..f402d08 100755
--- a/docker/dockerbuild.sh
+++ b/docker/dockerbuild.sh
@@ -15,7 +15,6 @@ if [ $UID -eq 0 ]; then
echo "$TARGET_HOSTS" | base64 -d >> /etc/hosts
else
- echo -e "\n[archlinuxcn]\nServer = https://repo.archlinuxcn.org/$$arch\n" | sudo tee -a /etc/pacman.conf
echo "$TARGET_HOSTS" | base64 -d | sudo tee -a /etc/hosts >/dev/null
fi
@@ -24,13 +23,9 @@ if [ $UID -eq 0 ]; then
su -c "echo $GPG_PRIV_KEY | base64 -d | gpg --import" build
- pushd repo/pod2man
- su -c 'makepkg -i -s --noconfirm --needed' build
- popd
-
- su -c 'BUILD_ONLY="" ./pkgbuild.sh' build
+ su -c './utils/pkgbuild.sh' build
- su -e -c './ci-upload.sh' build
+ su -e -c './utils/ci-upload.sh' build
else
@@ -40,9 +35,9 @@ else
makepkg -i -s --noconfirm --needed
popd
- BUILD_ONLY='' ./pkgbuild.sh
+ ./utils/pkgbuild.sh
- ./ci-upload.sh
+ ./utils/ci-upload.sh
fi