diff --git a/.github/workflows/aur-release.yml b/.github/workflows/aur-release.yml index a62a994..d9b61d0 100644 --- a/.github/workflows/aur-release.yml +++ b/.github/workflows/aur-release.yml @@ -12,7 +12,13 @@ jobs: env: RELEASE_TAG: ${{ github.ref }} run: | - version=$([ -n "${RELEASE_TAG}" ] && (echo "${RELEASE_TAG}" | sed 's#^.*v##g') || (cat dotdrop/version.py | grep version | sed 's/^.*= .\(.*\).$/\1/g')) + version="" + if [ -n "${RELEASE_TAG}" ]; then + version=$(echo "${RELEASE_TAG}" | sed 's#^.*v##g') + else + version=$(cat dotdrop/version.py | grep version | sed 's/^.*= .\(.*\).$/\1/g') + fi + [ -z "${version}" ] && exit 1 sed -i "s/^pkgver=.*$/pkgver=${version}/g" packages/arch-dotdrop/PKGBUILD cat packages/arch-dotdrop/PKGBUILD - name: Publish to aur diff --git a/packages/snap/snapcraft.yaml b/packages/snap/snapcraft.yaml index 7b4ad36..c187b28 100644 --- a/packages/snap/snapcraft.yaml +++ b/packages/snap/snapcraft.yaml @@ -24,7 +24,7 @@ grade: stable apps: dotdrop: - command: dotdrop + command: bin/dotdrop plugs: - home @@ -45,4 +45,5 @@ parts: if [ -z ${VERSION} ]; then VERSION=$(cat dotdrop/version.py | grep version | sed 's/^.*= .\(.*\).$/\1/g') fi + [ -z "${VERSION}" ] && exit 1 snapcraftctl set-version "${VERSION}"