aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKunoiSayami <[email protected]>2021-10-24 23:25:39 +0800
committerKunoiSayami <[email protected]>2021-10-24 23:25:39 +0800
commitd0e536ec9f19d85b42b77f3ba28ae0b1e719ac77 (patch)
treeb05469cc7319f4a61a2d10c3dc656a72bc2a2c32
parent0bd9e63f7f333cf0c2ec0e272c269d62f0dda013 (diff)
feat(script): Require install dependencies while build packages
Signed-off-by: KunoiSayami <[email protected]>
-rwxr-xr-xdeploy.sh4
-rwxr-xr-xpkgbuild.sh6
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