diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build_appimage.sh | 4 | ||||
| -rwxr-xr-x | scripts/build_arch.sh | 4 | ||||
| -rwxr-xr-x | scripts/build_deb.sh | 4 | ||||
| -rwxr-xr-x | scripts/build_rpm.sh | 4 | ||||
| -rwxr-xr-x | scripts/sign.sh | 18 | ||||
| -rwxr-xr-x | scripts/sync_versions.sh | 20 |
6 files changed, 4 insertions, 50 deletions
diff --git a/scripts/build_appimage.sh b/scripts/build_appimage.sh index d39f506..b409961 100755 --- a/scripts/build_appimage.sh +++ b/scripts/build_appimage.sh @@ -12,7 +12,6 @@ linuxdeploy=$6 version=`just version` staging="$(mktemp -d)" -just dist tar -xJf "_build/meson-dist/map-${version}.tar.xz" -C "${staging}/" cp ${linuxdeploy} "${staging}/linuxdeploy.AppImage" @@ -32,6 +31,5 @@ podman run --rm -v "${staging}:/build:Z" \ mv /build/Map*.AppImage /build/out/ " -mkdir -p dist -mv ${staging}/out/*.AppImage "dist/${app_name}-${arch}-${channel}.AppImage" +mv ${staging}/out/*.AppImage "_dist/${app_name}-${arch}-${channel}.AppImage" rm -rf "${staging}" diff --git a/scripts/build_arch.sh b/scripts/build_arch.sh index 602b31d..c4a3c0c 100755 --- a/scripts/build_arch.sh +++ b/scripts/build_arch.sh @@ -11,7 +11,6 @@ channel=$5 version=`just version` staging="$(mktemp -d)" -just dist cp _build/meson-dist/map-${version}.tar.xz "${staging}/" cp build-aux/arch/PKGBUILD "${staging}/" @@ -28,6 +27,5 @@ podman run --rm -v "${staging}:/build:Z" \ cp /tmp/pkg/map-${version}-1-${arch}.pkg.tar.gz /build/out/ " -mkdir -p dist -cp ${staging}/out/*.pkg.tar.gz "dist/${app_name}-${arch}-${channel}-${distro}.pkg.tar.gz" +cp ${staging}/out/*.pkg.tar.gz "_dist/${app_name}-${arch}-${channel}-${distro}.pkg.tar.gz" rm -rf "${staging}" diff --git a/scripts/build_deb.sh b/scripts/build_deb.sh index 66b51fa..d7f978b 100755 --- a/scripts/build_deb.sh +++ b/scripts/build_deb.sh @@ -11,7 +11,6 @@ channel=$5 version=`just version` staging="$(mktemp -d)" -just dist cp _build/meson-dist/map-${version}.tar.xz "${staging}/${app_name}_${version}.orig.tar.xz" tar -xJf "${staging}/${app_name}_${version}.orig.tar.xz" -C "${staging}" mkdir -p ${staging}/${app_name}-${version} @@ -26,6 +25,5 @@ podman run --rm -v "${staging}:/build:Z" \ cp /build/${app_name}_${version}*_*.deb /build/out/ " -mkdir -p dist -cp ${staging}/out/*.deb "dist/${app_name}-${arch}-${channel}-${distro}.deb" +cp ${staging}/out/*.deb "_dist/${app_name}-${arch}-${channel}-${distro}.deb" rm -rf "${staging}" diff --git a/scripts/build_rpm.sh b/scripts/build_rpm.sh index efffef3..ac2510d 100755 --- a/scripts/build_rpm.sh +++ b/scripts/build_rpm.sh @@ -11,7 +11,6 @@ channel=$5 version=`just version` staging="$(mktemp -d)" -just dist cp _build/meson-dist/map-${version}.tar.xz "${staging}/" just vendor "${staging}/vendor" @@ -31,6 +30,5 @@ podman run --rm -v "${staging}:/build:Z" \ cp ~/rpmbuild/RPMS/${arch}/map-${version}-1.*.rpm /build/out/ " -mkdir -p dist -cp ${staging}/out/*.rpm "dist/${app_name}-${arch}-${channel}-${distro}.rpm" +cp ${staging}/out/*.rpm "_dist/${app_name}-${arch}-${channel}-${distro}.rpm" rm -rf "${staging}" diff --git a/scripts/sign.sh b/scripts/sign.sh deleted file mode 100755 index b3bfe47..0000000 --- a/scripts/sign.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -set +x -if [ $# -ne 3 ]; then - echo "Usage: $0 <file> <channel> <architecture>" - exit 1 -fi - -FILE="$1" -VERSION="$2" -PLATFORM="$3" -COMMENT="Version: ${VERSION}, File: $(basename ${FILE}) Built on: $(date +'%Y-%m-%d %H:%M'), Platform: ${PLATFORM}" - -if [ -f ~/.minisign/minisign.pass ]; then - cat ~/.minisign/minisign.pass | minisign -Sm "${FILE}" -t "${COMMENT}" -else - minisign -Sm "${FILE}" -t "${COMMENT}" -fi diff --git a/scripts/sync_versions.sh b/scripts/sync_versions.sh deleted file mode 100755 index f3955ef..0000000 --- a/scripts/sync_versions.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -version=`just version` - -echo "Using version from meson.build: ${version}" - -# Rust Cargo.toml -echo -ne "\tUpdating: Cargo.toml" -sed -i "s/^version = \"[^\"]*\"$/version = \"$version\"/" Cargo.toml -echo -e "\r\tUpdated: Cargo.toml " - -# Arch PKGBUILD -echo -ne "\tUpdating: PKGBUILD" -sed -i "s/^pkgver=.*$/pkgver=$version/" build-aux/arch/PKGBUILD -echo -e "\r\tUpdated: PKGBUILD " - -# Fedora RPM Spec -echo -ne "\tUpdating: map.spec" -sed -i "s/^Version: .*$/Version: $version/" build-aux/rpm/map.spec -echo -e "\r\tUpdated: map.spec " |