diff options
| author | KunoiSayami <[email protected]> | 2021-11-28 01:29:24 +0800 |
|---|---|---|
| committer | KunoiSayami <[email protected]> | 2021-11-28 01:31:33 +0800 |
| commit | 2a8248029c0384c3304a0f59efe5f6ebce8a34b2 (patch) | |
| tree | d9491f7832bfb0365cffe03b92cb9d6e7e7c633b | |
| parent | ea1261d05788acd82f7d82fb03d814b930eed1f0 (diff) | |
fix(script): [REBUILD] Fix exit while packaging meta package
Signed-off-by: KunoiSayami <[email protected]>
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | repo/.verified_repos | 13 | ||||
| -rwxr-xr-x | utils/pkgbuild.sh | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87552c0..1bcfc99 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,8 @@ build: - curl -fL https://keys.openpgp.org/vks/v1/by-fingerprint/4A0F0C8BC709ACA4341767FB243975C8DB9656B9 | pacman-key --add - - pacman-key --finger 4A0F0C8BC709ACA4341767FB243975C8DB9656B9 - pacman-key --lsign-key 4A0F0C8BC709ACA4341767FB243975C8DB9656B9 - - pacman --noconfirm --needed -Syu kunoisayami-gitlab-ci + #- pacman --noconfirm --needed -Syu kunoisayami-gitlab-ci + - pacman --noconfirm --needed -Syu base-devel git gnupg yay - useradd -m build - echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers #- cp -r ../$CI_PROJECT_TITLE /home/build/ diff --git a/repo/.verified_repos b/repo/.verified_repos index 9ed10f5..7daaf63 100644 --- a/repo/.verified_repos +++ b/repo/.verified_repos @@ -5,4 +5,15 @@ pam_ssh_agent_auth_patched mozjpeg linux-zen-x86-64-v3 glib2-static -qemu-user-static
\ No newline at end of file +qemu-user-static +obs-studio-browser +rime-lua-hook-git +rime-flypy +gtk3-classic +yay +wget2 +acme.sh-letsencrypt +vlc-luajit +konsole-dracula-git +ant-dracula-icon +zsh-ssr-theme
\ No newline at end of file diff --git a/utils/pkgbuild.sh b/utils/pkgbuild.sh index 4bdb722..36ee1e4 100755 --- a/utils/pkgbuild.sh +++ b/utils/pkgbuild.sh @@ -152,7 +152,7 @@ while read -r FOLDER_NAME ; do echo -e "\033[0;31mSkip folder $FOLDER_NAME\033[0m"; UNSUCCESSFUL=1; } - rm -r "$SRCDEST" || true + [ -d "$SRCDEST" ] && rm -r "$SRCDEST" popd done < "$REPO_DIFF" @@ -161,7 +161,7 @@ popd date +%s > "$PKGDEST/LASTBUILD" if [ $UNSUCCESSFUL -eq 1 ]; then - rm -r "$SRCDEST" || true + [ -d "$SRCDEST" ] && rm -r "$SRCDEST" if [ -n "$CI_DEFAULT_BRANCH" ] && [ -n "$CI_COMMIT_BRANCH" ] && [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then touch .fail else |