From befc6a660d053a748655db676feb5cc66ff4dcd1 Mon Sep 17 00:00:00 2001 From: mzz2017 Date: Thu, 16 Sep 2021 02:29:52 +0800 Subject: [PATCH] chore: fix release --- install/aur/deploy.sh | 2 +- install/aur/deploy_v2raya.sh | 8 +++----- install/aur/deploy_v2raya_bin.sh | 8 +++----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/install/aur/deploy.sh b/install/aur/deploy.sh index dd406b33..02c4a9ad 100644 --- a/install/aur/deploy.sh +++ b/install/aur/deploy.sh @@ -11,4 +11,4 @@ git config --global user.email "$(git show -s --format='%ae')" bash ./install/aur/deploy_v2raya.sh bash ./install/aur/deploy_v2raya_bin.sh echo "ok" -cd $P_DIR #回项目目录 +cd $P_DIR diff --git a/install/aur/deploy_v2raya.sh b/install/aur/deploy_v2raya.sh index 5105f464..895daf7e 100644 --- a/install/aur/deploy_v2raya.sh +++ b/install/aur/deploy_v2raya.sh @@ -3,17 +3,15 @@ set -ex mkdir -p /tmp/prepare/v2raya cd /tmp/prepare/v2raya -cp "$P_DIR"/install/aur/v2raya/* ./ -cp "$P_DIR"/install/aur/v2raya/.* ./ +cp -r "$P_DIR"/install/aur/v2raya/. ./ sed -i s/{{pkgver}}/"${VERSION:1}"/g PKGBUILD .SRCINFO cd /tmp/ git clone ssh://aur@aur.archlinux.org/v2raya.git cd v2raya -cp -f /tmp/prepare/v2raya/* ./ -cp -f /tmp/prepare/v2raya/.* ./ +cp -rf /tmp/prepare/v2raya/. ./ git add . git commit -m "release $VERSION" git push -u -f origin master -cd $P_DIR #回项目目录 +cd $P_DIR diff --git a/install/aur/deploy_v2raya_bin.sh b/install/aur/deploy_v2raya_bin.sh index 2179b411..968e7c5a 100644 --- a/install/aur/deploy_v2raya_bin.sh +++ b/install/aur/deploy_v2raya_bin.sh @@ -13,8 +13,7 @@ sha_desktop=$(sha1sum "$P_DIR"/install/universal/v2raya.desktop | awk '{print $1 mkdir -p /tmp/prepare/v2raya-bin cd /tmp/prepare/v2raya-bin -cp "$P_DIR"/install/aur/v2raya-bin/* ./ -cp "$P_DIR"/install/aur/v2raya-bin/.* ./ +cp -r "$P_DIR"/install/aur/v2raya-bin/. ./ cp "$P_DIR"/install/universal/v2raya.desktop ./ cp "$P_DIR"/install/universal/v2raya.png ./ cp "$P_DIR"/install/universal/v2raya.service ./ @@ -34,9 +33,8 @@ sed -i s/{{sha_desktop}}/"${sha_desktop}"/g PKGBUILD .SRCINFO cd /tmp/ git clone ssh://aur@aur.archlinux.org/v2raya-bin.git cd v2raya-bin -cp -f /tmp/prepare/v2raya-bin/* ./ -cp -f /tmp/prepare/v2raya-bin/.* ./ +cp -rf /tmp/prepare/v2raya-bin/. ./ git add . git commit -m "release $VERSION" git push -u -f origin master -cd $P_DIR #回项目目录 +cd $P_DIR