feat(script): Remove architecture code in manage scipt

Signed-off-by: KunoiSayami <[email protected]>

4 files changed, 15 insertions, 14 deletions

diff --git a/ci-upload.sh b/ci-upload.sh
index 9aa5f1a..9af18d4 100755
--- a/ci-upload.sh
+++ b/ci-upload.sh
@@ -14,17 +14,17 @@ cleanup() {
 ARCH=$(uname -m)
 PKGDEST="${PWD}/packages/$ARCH"
 
-curl -d "token=$UPLOAD_TOKEN&action=REQUIRE_CLEAN" -fsSL "$REMOTE_PATH"
+curl -d "token=$UPLOAD_TOKEN&action=REQUIRE_CLEAN&arch=$ARCH" -fsSL "$REMOTE_PATH"
 
 pushd $PKGDEST
 
 for file in *.pkg*; do
 	echo "Start upload package $file size: $(ls -lh $file | awk '{print  $5}')..."
-    curl -F "file=@$file" -F "token=$UPLOAD_TOKEN" -fsSL "$REMOTE_PATH"
+    curl -F "file=@$file" -F "token=$UPLOAD_TOKEN" -F "arch=$ARCH" -fsSL "$REMOTE_PATH"
 	#echo "Stop upload package $file"
 done
 
 popd
 
-curl -d "token=$UPLOAD_TOKEN&action=UPLOADED" -fsSL "$REMOTE_PATH"
+curl -d "token=$UPLOAD_TOKEN&action=UPLOADED&arch=$ARCH" -fsSL "$REMOTE_PATH"
 
diff --git a/deploy.sh b/deploy.sh
index 691ad2e..5e25e73 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -7,6 +7,5 @@ if [ $# -eq 0 ]; then
     echo 'Should provide least one argument'
     exit 1
 fi
-ARCH=$(/usr/bin/uname -m)
-/usr/bin/date +%s > "packages/$ARCH/LASTSYNC"
-/usr/bin/rsync --partial -r --update --links --delete --exclude=.gitignore "packages/$ARCH" $1:/var/www/repo/
+/usr/bin/date +%s > "packages/LASTSYNC"
+/usr/bin/rsync --partial -r --update --links --delete --exclude=.gitignore "packages/" $1:/var/www/repo/
diff --git a/pkgbuild.sh b/pkgbuild.sh
index 8f3fc55..8764da7 100755
--- a/pkgbuild.sh
+++ b/pkgbuild.sh
@@ -13,8 +13,8 @@ cleanup() {
 	unset CONFDEST
 	unset REPO_DEST
 	rm -f "$TMPCONF"
-	rm -rf "$REPO_PENDING"
-	rm -rf "$REPO_DIFF"
+	rm -f "$REPO_PENDING"
+	rm -f "$REPO_DIFF"
 	unset TMPCONF
 	unset REPO_PENDING
 	unset REPO_DIFF
@@ -53,7 +53,7 @@ if [ $# -gt 0 ] && [ "$1" = "--diff" ]; then
     exit 0
 fi
 
-if [ $# -gt 0 ] && [ "$1" = "--all" ] || [[ $CI_COMMIT_TITLE =~ "fix(repo)" ]]; then
+if [ $# -gt 0 ] && [ "$1" = "--all" ] || [ -z "$CI_COMMIT_TITLE" ] && [[ $CI_COMMIT_TITLE =~ "fix(repo)" ]]; then
     ls $PKGBUILD_DIRECTORY_BASE > "$REPO_DIFF"
 else
     get_diff_list
@@ -65,10 +65,7 @@ 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 -s --asdeps --noconfirm --needed --noprogressbar
-    if [ $? == 0 ]; then
-        echo "$PACKAGE_NAME" >> "$REPO_PENDING"
-    fi
-    #cp "$PACKAGE_NAME"* ../../../packages/
+    echo "$PACKAGE_NAME" >> "$REPO_PENDING"
     popd
 done < "$REPO_DIFF"
 
diff --git a/repodb.sh b/repodb.sh
index c959de4..212b137 100755
--- a/repodb.sh
+++ b/repodb.sh
@@ -15,8 +15,13 @@ cleanup() {
 	unset LATEST
 }
 
+if [ -z $ARCH ]; then
+	ARCH=$(uname -m)
+	echo "Warning: You should specify arch environment variable, use current platform: $ARCH"
+fi
+
 REPO_BASE_NAME="kunoisayami"
-ARCH=$(uname -m)
+#ARCH=$(uname -m)
 REPO_DEST="${PWD}/packages/$ARCH/$REPO_BASE_NAME.db.tar.xz"
 GPG_KEY="4A0F0C8BC709ACA4341767FB243975C8DB9656B9"