From d0e536ec9f19d85b42b77f3ba28ae0b1e719ac77 Mon Sep 17 00:00:00 2001 From: KunoiSayami Date: Sun, 24 Oct 2021 23:25:39 +0800 Subject: feat(script): Require install dependencies while build packages Signed-off-by: KunoiSayami --- deploy.sh | 4 ++-- pkgbuild.sh | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/deploy.sh b/deploy.sh index 4d7c6e4..b6d5224 100755 --- a/deploy.sh +++ b/deploy.sh @@ -4,5 +4,5 @@ if [ $# -eq 0 ]; then exit 1 fi ARCH=$(/usr/bin/uname -m) -/usr/bin/rsync --partial -r --update --link --delete $DEPLOY_ARGS --exclude=.gitignore "packages/$ARCH" $1:/var/www/repo/ -echo "date +%s > /var/www/repo/$ARCH/LAST_SYNC" | /usr/bin/xargs /usr/bin/ssh $1 +/usr/bin/date +%s > "packages/$ARCH/LASTSYNC" +/usr/bin/rsync --partial -r --update --links --delete --exclude=.gitignore "packages/$ARCH" $1:/var/www/repo/ diff --git a/pkgbuild.sh b/pkgbuild.sh index 5d99157..4fe9178 100755 --- a/pkgbuild.sh +++ b/pkgbuild.sh @@ -36,7 +36,7 @@ pushd $PKGBUILD_DIRECTORY_BASE || ( echo "Error, can't switch to pkgbuild direct while read PACKAGE_NAME ; do #PACKAGE_NAME=$(printf $folder | sed 's/.$//') pushd "$PACKAGE_NAME" || continue - SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF="$TMPCONF" makepkg --clean + SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF="$TMPCONF" makepkg --clean -s if [ $? == 0 ]; then echo "$PACKAGE_NAME" >> "$REPO_PENDING" fi @@ -61,3 +61,7 @@ unset REPO_DEST rm -rf "$REPO_PENDING" rm -rf "$REPO_DIFF" unset REPO_PENDING +unset REPO_DIFF +unset PKGBUILD_DIRECTORY_BASE +unset ARCH +unset REPO_BASE_NAME -- cgit v1.3.1