diff --git a/.gitignore b/.gitignore index f7e4014..e430005 100644 --- a/.gitignore +++ b/.gitignore @@ -66,4 +66,5 @@ ehthumbs.db Thumbs.db # demo project -MyPlasmoid \ No newline at end of file +MyPlasmoid +pkg/deb/prasmoid/debian/prasmoid.config.js diff --git a/pkg/.gitignore b/pkg/.gitignore index 74e5b1d..4a766b5 100644 --- a/pkg/.gitignore +++ b/pkg/.gitignore @@ -1 +1,2 @@ -!* \ No newline at end of file +!* +*.log diff --git a/pkg/aur/BUILD b/pkg/aur/BUILD new file mode 100755 index 0000000..b0d5ab7 --- /dev/null +++ b/pkg/aur/BUILD @@ -0,0 +1,15 @@ +#!/bin/bash + +# check PKGBUILD +namcap PKGBUILD + +# build in chroot +pkgctl build + +# check package +namcap *.pkg.tar.zst + +# upload +#git add PKGBUILD .SRCINFO +#git commit -m "something useful" +#git push \ No newline at end of file diff --git a/pkg/aur/PKGBUILD b/pkg/aur/PKGBUILD index d97cdfb..ae29da9 100644 --- a/pkg/aur/PKGBUILD +++ b/pkg/aur/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Clem Lorteau pkgname=prasmoid -pkgver=0.0.3 +pkgver=0.0.4 pkgrel=2 pkgdesc="The All in One Development Toolkit for KDE Plasmoids. Build, test, and manage your plasmoids with unparalleled ease and efficiency." arch=("x86_64") @@ -11,16 +11,16 @@ depends=( "qt6-declarative" ) makedepends=( - "go>=1.22" + "go>=1.23" "git" ) source=( - "${pkgname}-${pkgver}::git+https://github.com/PRASSamin/prasmoid.git#tag=v0.0.3" + "${pkgname}-${pkgver}::git+https://github.com/PRASSamin/prasmoid.git#tag=v0.0.4" ) sha256sums=( - '7044508f97f1e4030adaf974aaaa0e19ff4f850b60731ed691cbe4873a12fdd5' + '2a4d67734ede4275377e4896916b366d7dbc5d8886d1bcb980f9713ef767c4a2' ) build() { @@ -34,7 +34,7 @@ build() { -buildmode=pie \ -mod=readonly \ -modcacherw \ - -ldflags "-s -w -X github.com/PRASSamin/prasmoid/internal.Version={pkgver}" -o prasmoid ./src + -ldflags "-s -w -X github.com/PRASSamin/prasmoid/internal.Version=${pkgver}" -o prasmoid . } package() { diff --git a/pkg/aur/PKGBUILD.binonly b/pkg/aur/PKGBUILD.binonly deleted file mode 100644 index 2286338..0000000 --- a/pkg/aur/PKGBUILD.binonly +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Clem Lorteau -pkgname=prasmoid -pkgver=0.0.3 -pkgrel=1 -pkgdesc="The All in One Development Toolkit for KDE Plasmoids. Build, test, and manage your plasmoids with unparalleled ease and efficiency." -arch=("x86_64") -url='https://github.com/PRASSamin/prasmoid' -license=("MIT") -depends=( - "plasma-sdk" - "git" - "qt6-declarative" -) - -# IMPORTANT: Maintain this exact order for both source and sha256sums arrays: -# 1. Main binary -# 2. License file -# 3. README file -# @prassamin -source=( - "https://github.com/PRASSamin/prasmoid/releases/download/v0.0.3/prasmoid" - "https://raw.githubusercontent.com/PRASSamin/prasmoid/refs/tags/v0.0.3/LICENSE.md" - "https://raw.githubusercontent.com/PRASSamin/prasmoid/refs/tags/v0.0.3/README.md" -) - -sha256sums=( - "eb6deb842aac8b6a0f45f5e62f0e0d721c269b95dd5831c75dacd9dae707c65a" - "1f3c5281949e670ffb5efacaae5acd3160eaa5ff1b19c0eab57987581f34fd93" - "7ff01b9338a985115e2c280251debc61a3722cc9a680d95b1774102600cbf597" -) - -package() { - install -Dm755 prasmoid "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md" - install -Dm644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} -# vim:set ts=2 sw=2 et: diff --git a/pkg/deb/BUILD b/pkg/deb/BUILD new file mode 100755 index 0000000..3feb624 --- /dev/null +++ b/pkg/deb/BUILD @@ -0,0 +1,19 @@ +#!/bin/bash +# +# Builds source and binary debian packages by compiling from source in a base chroot +# Assumes a fresh pbuilder up-to-date environment for the target distro with nothing in 'result' + +set -e + +DIST=plucky + +# build in chroot +sudo cowbuilder build --logfile build.log --distribution $DIST --hookdir $(pwd)/prasmoid/debian/pbuilderhook.d prasmoid_0.0.4-1.dsc + +# check +lintian /var/cache/pbuilder/result/*source.changes + +# upload +#sudo sed -i '/\.buildinfo/d' /var/cache/pbuilder/result/*source.changes #don't upload binary +#debsign /var/cache/pbuilder/result/*source.changes +#dput ppa:northern-lights/prasmoid /var/cache/pbuilder/result/*source.changes diff --git a/pkg/deb/prasmoid/debian/.gitignore b/pkg/deb/prasmoid/debian/.gitignore index c7b2f57..721665b 100644 --- a/pkg/deb/prasmoid/debian/.gitignore +++ b/pkg/deb/prasmoid/debian/.gitignore @@ -4,4 +4,4 @@ /.debhelper/ /debhelper-build-stamp /files - +prasmoid.config.js \ No newline at end of file diff --git a/pkg/deb/prasmoid/debian/README b/pkg/deb/prasmoid/debian/README deleted file mode 100755 index e510449..0000000 --- a/pkg/deb/prasmoid/debian/README +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -# -# Builds source and binary debian packages by compiling from source in a base chroot - -# Replace plucky with target distro -DIST=plucky - -# optionally mount the cache dir as tmpfs for speed at the cost of a lot of RAM -#sudo cat "tmpfs /var/cache/pbuilder tmpfs defaults,size=6000M 0 0" >> /etc/fstab -#sudo mount /var/cache/pbuilder -#sudo mkdir /var/cache/pbuilder/aptcache - -# Create build environment that will be chroot'ed into during packaging -#sudo apt install pbuilder cowbuilder -#sudo pbuilder create --distribution $DIST -#sudo cowbuilder --create --distribution $DIST -#sudo ln -s /var/cache/pbuilder/base.cow /var/cache/pbuilder/base-$DIST.cow - -# Install build deps -# sudo apt install debhelper-compat dh-sequence-golang golang-github-alecaivazis-survey-dev \ -# golang-github-bmatcuk-doublestar-dev golang-github-dop251-goja-dev golang-github-fatih-color-dev \ -# golang-github-fsnotify-fsnotify-dev golang-github-spf13-cobra-dev golang-golang-x-sys-dev \ -# golang-golang-x-term-dev qt6-declarative-dev-tools golang-github-go-sourcemap-sourcemap-dev \ -# golang-github-google-pprof-dev - -# build -pushd .. -sudo cowbuilder build --distribution $DIST --hookdir $(pwd)/debian/pbuilderhook.d ../prasmoid_0.0.3-1.dsc - -# check result -# lintian ../*source.changes - -# sign -# debsign ../*source.changes - -# upload -# dput ppa:northern-lights/prasmoid ../*source.changes - -popd - -# cannot find package "github.com/adrg/frontmatter" in any of: -# /usr/lib/go-1.24/src/github.com/adrg/frontmatter (from $GOROOT) -# /build/prasmoid-0.0.3/_build/src/github.com/adrg/frontmatter (from $GOPATH) diff --git a/pkg/deb/prasmoid/debian/changelog b/pkg/deb/prasmoid/debian/changelog index a551219..6377a81 100644 --- a/pkg/deb/prasmoid/debian/changelog +++ b/pkg/deb/prasmoid/debian/changelog @@ -1,3 +1,13 @@ +prasmoid (0.0.4-1) plucky; urgency=medium + + * Prasmoid update me has been renamed to prasmoid upgrade (shorter and clearer). + * The commands subcommand is now just command. You can manage custom commands with prasmoid command add/remove. + * Install script now gives clearer feedback while running. + * Logs show complex data more cleanly. + * Improved init command with better setup. + + -- Clem Lorteau Thu, 11 Sep 2025 19:20:27 -0700 + prasmoid (0.0.3-1) plucky; urgency=medium * Initial release (Closes: #xxxx) diff --git a/pkg/deb/prasmoid/debian/control b/pkg/deb/prasmoid/debian/control index a4a930f..7374f6a 100644 --- a/pkg/deb/prasmoid/debian/control +++ b/pkg/deb/prasmoid/debian/control @@ -15,9 +15,9 @@ Build-Depends: debhelper-compat (= 13), golang-github-spf13-cobra-dev, golang-golang-x-sys-dev, golang-golang-x-term-dev, - golang-golang-x-net-dev, golang-github-google-pprof-dev, golang-github-go-sourcemap-sourcemap-dev, + golang-github-stretchr-testify-dev, plasma-sdk, qt6-declarative-dev-tools, curl, @@ -34,7 +34,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, Static-Built-Using: ${misc:Static-Built-Using} -Description: The All in One Development Toolkit for KDE Plasmoids. (program) +Description: The All in One Development Toolkit for KDE Plasmoids. Prasmoid CLI . ------------------------------------------------------------------------ diff --git a/pkg/deb/prasmoid/debian/pbuilderhook.d/C10shell b/pkg/deb/prasmoid/debian/pbuilderhook.d/C10shell index f07112f..9189af9 100755 --- a/pkg/deb/prasmoid/debian/pbuilderhook.d/C10shell +++ b/pkg/deb/prasmoid/debian/pbuilderhook.d/C10shell @@ -1,4 +1,4 @@ #!/bin/sh -echo "** Build failed, bringing up shell" +echo "\n\n** Build failed, bringing up shell\n" apt-get install -y vim less fish > /dev/null /bin/fish < /dev/tty > /dev/tty 2> /dev/tty \ No newline at end of file diff --git a/pkg/deb/prasmoid/debian/rules b/pkg/deb/prasmoid/debian/rules index f59b3a5..877a49b 100755 --- a/pkg/deb/prasmoid/debian/rules +++ b/pkg/deb/prasmoid/debian/rules @@ -3,10 +3,3 @@ %: dh $@ --builddirectory=_build --buildsystem=golang -override_dh_auto_install: - # dh_auto_install -- --no-source - dh_auto_install - rm debian/prasmoid/usr/bin/prasmoid - mv debian/prasmoid/usr/bin/src debian/prasmoid/usr/bin/prasmoid - - diff --git a/pkg/deb/prasmoid_0.0.3.orig.tar.gz b/pkg/deb/prasmoid_0.0.3.orig.tar.gz deleted file mode 100644 index 499dd91..0000000 Binary files a/pkg/deb/prasmoid_0.0.3.orig.tar.gz and /dev/null differ diff --git a/pkg/deb/prasmoid_0.0.4-1.debian.tar.xz b/pkg/deb/prasmoid_0.0.4-1.debian.tar.xz new file mode 100644 index 0000000..566e700 Binary files /dev/null and b/pkg/deb/prasmoid_0.0.4-1.debian.tar.xz differ diff --git a/pkg/deb/prasmoid_0.0.3-1.dsc b/pkg/deb/prasmoid_0.0.4-1.dsc similarity index 55% rename from pkg/deb/prasmoid_0.0.3-1.dsc rename to pkg/deb/prasmoid_0.0.4-1.dsc index 70adb5d..eac529b 100644 --- a/pkg/deb/prasmoid_0.0.3-1.dsc +++ b/pkg/deb/prasmoid_0.0.4-1.dsc @@ -1,11 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - Format: 3.0 (quilt) Source: prasmoid Binary: prasmoid Architecture: any -Version: 0.0.3-1 +Version: 0.0.4-1 Maintainer: Debian Go Packaging Team Uploaders: Clem Lorteau , Homepage: https://github.com/PRASSamin/prasmoid @@ -17,20 +14,13 @@ Build-Depends: debhelper-compat (= 13), dh-sequence-golang, golang-any, golang-g Package-List: prasmoid deb golang optional arch=any Checksums-Sha1: - 136c24fcbe94c01208c4333ecd853c622f5f507d 921468 prasmoid_0.0.3.orig.tar.gz - 47742965dc58f11ddb0454625552b19ce8aca259 324520 prasmoid_0.0.3-1.debian.tar.xz + 9f4a3b9d3d90b26993e0208c8bd18739d961f4c5 1851675 prasmoid_0.0.4.orig.tar.gz + 76c2663cf7666ff1210ba124775168b2cc8a0509 3476 prasmoid_0.0.4-1.debian.tar.xz Checksums-Sha256: - 53a0c0c645f0e2d4ba4985d853af192bc55296114d75bfa9b1911bb45208cc17 921468 prasmoid_0.0.3.orig.tar.gz - c1b821993449aeafb0fb93c621c1e3d2372a82608f57a53f150fbe532c25582f 324520 prasmoid_0.0.3-1.debian.tar.xz + 2ddd45a8f177e20e2d368dc6a2e5729fd9b8acbba9dfba7f9829cb01315713e3 1851675 prasmoid_0.0.4.orig.tar.gz + 46f9d106dacaf0c479a9c1d9962590918cf3c9df0f33a0bd6597c2062c885776 3476 prasmoid_0.0.4-1.debian.tar.xz Files: - 2e3bd0a379ca8bad35a42d6c17512b0f 921468 prasmoid_0.0.3.orig.tar.gz - 8ea57006c30877dd2f2bb848d515af9f 324520 prasmoid_0.0.3-1.debian.tar.xz + c6f85260379265d11dbe215608fb4569 1851675 prasmoid_0.0.4.orig.tar.gz + 828a57840a61ce7bb7689b49ad1f254a 3476 prasmoid_0.0.4-1.debian.tar.xz Go-Import-Path: github.com/PRASSamin/prasmoid ------BEGIN PGP SIGNATURE----- - -iIYEARYKAC4WIQSbnCN78hmmAjXm26fVpLUsx0toXwUCaKEYjBAcY2xlbUBsb3J0 -ZWF1LmZyAAoJENWktSzHS2hf3E0A/jDA7nBdYq+f59XMWI/A2JYUZw5xJhWmmHOf -x60AWlk2AQDwyxeeKFY80Srzr1ElZvMXX6HZ9Sk0JHAabZKK7WhhBA== -=vkLt ------END PGP SIGNATURE----- diff --git a/pkg/deb/prasmoid_0.0.4.orig.tar.gz b/pkg/deb/prasmoid_0.0.4.orig.tar.gz new file mode 100644 index 0000000..91f056e Binary files /dev/null and b/pkg/deb/prasmoid_0.0.4.orig.tar.gz differ diff --git a/pkg/rpm/.gitignore b/pkg/rpm/.gitignore new file mode 100644 index 0000000..13f4953 --- /dev/null +++ b/pkg/rpm/.gitignore @@ -0,0 +1,3 @@ +*.tar.gz +results_prasmoid/* +*.rpm \ No newline at end of file diff --git a/pkg/rpm/BUILD b/pkg/rpm/BUILD new file mode 100755 index 0000000..dc8df23 --- /dev/null +++ b/pkg/rpm/BUILD @@ -0,0 +1,17 @@ +#!/bin/bash + +set -e + +# download specified version of sources +spectool -g prasmoid.spec + +# build +fedpkg --release f42 mockbuild + +# check +# rpm --query --package --list results_prasmoid/0.0.4/1.fc42/prasmoid-0.0.4-1.fc42.x86_64.rpm +# fedpkg --release f42 lint + +# upload +#copr-cli build prasmoid prasmoid-0.0.4-1.fc42.src.rpm + diff --git a/pkg/rpm/README b/pkg/rpm/README deleted file mode 100755 index a6c5c87..0000000 --- a/pkg/rpm/README +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# download specified version of sources -# spectool -g prasmoid.spec - -# build -fedpkg --release f42 mockbuild - -# check -rpm --query --package --list results_prasmoid/0.0.3/2.fc42/prasmoid-0.0.3-2.fc42.x86_64.rpm -fedpkg --release f42 lint - -# upload and build on copr -copr-cli build prasmoid prasmoid-0.0.3-2.fc42.src.rpm - diff --git a/pkg/rpm/prasmoid-0.0.4-vendor.tar.bz2 b/pkg/rpm/prasmoid-0.0.4-vendor.tar.bz2 new file mode 100644 index 0000000..7af29a4 Binary files /dev/null and b/pkg/rpm/prasmoid-0.0.4-vendor.tar.bz2 differ diff --git a/pkg/rpm/prasmoid.spec b/pkg/rpm/prasmoid.spec index 6529ebc..bf513d2 100644 --- a/pkg/rpm/prasmoid.spec +++ b/pkg/rpm/prasmoid.spec @@ -1,21 +1,17 @@ %bcond check 1 -# https://github.com/PRASSamin/prasmoid %global goipath github.com/PRASSamin/prasmoid -Version: 0.0.3 +Version: 0.0.4 %gometa -L -f - Name: prasmoid -Release: 2%{?dist} +Release: 1%{?dist} Summary: The All in One Development Toolkit for KDE Plasmoids -# Generated by go-vendor-tools -License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT +License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT URL: %{gourl} Source0: %{gosource} -# Generated by go-vendor-tools Source1: %{archivename}-vendor.tar.bz2 Source2: go-vendor-tools.toml @@ -36,7 +32,7 @@ The All in One Development Toolkit for KDE Plasmoids. %prep %goprep -A %setup -q -T -D -a1 %{forgesetupargs} -%autopatch -p1 +# %autopatch -p1 %generate_buildrequires %go_vendor_license_buildrequires -c %{S:2} @@ -45,15 +41,15 @@ The All in One Development Toolkit for KDE Plasmoids. %global gomodulesmode GO111MODULE=on export PATH=$PATH: %gobuild -o %{gobuilddir}/bin/prasmoid %{goipath} -for cmd in src; do - %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd -done -rm %{gobuilddir}/bin/prasmoid -mv %{gobuilddir}/bin/src %{gobuilddir}/bin/prasmoid +# for cmd in prasmoid/*; do +# %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd +# done +# rm %{gobuilddir}/bin/prasmoid +# mv %{gobuilddir}/bin/src %{gobuilddir}/bin/prasmoid %install %go_vendor_license_install -c %{S:2} -install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp %{gobuilddir}/bin/prasmoid %{buildroot}%{_bindir}/ # rm %{buildroot}/lib/debug/usr/bin/*.debug diff --git a/pkg/snap/.gitignore b/pkg/snap/.gitignore new file mode 100644 index 0000000..d294450 --- /dev/null +++ b/pkg/snap/.gitignore @@ -0,0 +1 @@ +*.snap diff --git a/pkg/snap/BUILD b/pkg/snap/BUILD new file mode 100755 index 0000000..6caa3e3 --- /dev/null +++ b/pkg/snap/BUILD @@ -0,0 +1,7 @@ +#!/bin/bash +set -e + +#build +snapcraft pack + +#upload diff --git a/pkg/snap/org.prasmoid.prasmoid.metainfo.xml b/pkg/snap/org.prasmoid.prasmoid.metainfo.xml old mode 100755 new mode 100644 index e8ae350..2132910 --- a/pkg/snap/org.prasmoid.prasmoid.metainfo.xml +++ b/pkg/snap/org.prasmoid.prasmoid.metainfo.xml @@ -29,6 +29,9 @@ + + https://github.com/PRASSamin/prasmoid/releases/download/v0.0.4 + https://github.com/PRASSamin/prasmoid/releases/download/v0.0.3 diff --git a/pkg/snap/snapcraft.yaml b/pkg/snap/snapcraft.yaml old mode 100755 new mode 100644 index d6852bb..ff8cab0 --- a/pkg/snap/snapcraft.yaml +++ b/pkg/snap/snapcraft.yaml @@ -1,16 +1,12 @@ -# last update 20250808 - name: prasmoid adopt-info: metadata -base: core22 # current=core24, keeping a bit of backwards compatibility since prasmoid - # depends on nothing -version: 'v0.0.3' +base: core22 +version: 'v0.0.4' license: 'MIT' summary: The All in One Development Toolkit for KDE Plasmoids -grade: stable # must be 'stable' to release into candidate/stable channels -# confinement: devmode +grade: stable confinement: strict apps: @@ -25,22 +21,22 @@ apps: parts: repo: source: https://github.com/PRASSamin/prasmoid.git - source-tag: v0.0.3 - plugin: dump #just copy files, nothing fancy + source-tag: v0.0.4 + plugin: dump override-build: | mv logo.svg org.prasmoid.prasmoid.svg craftctl default binary: - source: https://github.com/PRASSamin/prasmoid/releases/download/v0.0.3/prasmoid - source-checksum: sha256/72e4c2b772188ff7ac3ac1b210238a2b9aff1ef8a2844f11df999a44990dcc96 - source-type: file #don't try to guess what to do with the source and do nothing but d/l files + source: https://github.com/PRASSamin/prasmoid/releases/download/v0.0.4/prasmoid + source-checksum: sha256/90b0db543e27c82aa32ad1b67410a37b375a82638b48a3301e774be10e44af93 + source-type: file plugin: dump override-build: | chmod +x prasmoid craftctl default prime: - - prasmoid # copies the file to the snap's root where the "command" tag above will pick it up + - prasmoid metadata: plugin: dump