diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/FETCH_HEAD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/FETCH_HEAD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/FETCH_HEAD 2024-11-01 19:06:34.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/FETCH_HEAD 2024-11-01 14:49:56.000000000 +0000 @@ -1,8 +1,8 @@ -2885583da330f9ccf332c3c8eecae336befd4140 branch 'dep/github.com-adrg-xdg-0.x' of https://github.com/BrycensRanch/Rokon +2a84ccfa4df6533b6326ecd496e8a01a5bb431d7 branch 'dep/github.com-adrg-xdg-0.x' of https://github.com/BrycensRanch/Rokon 9a426ad20da0dfdcced251637919de709135ab77 branch 'dep/github.com-golangci-golangci-lint-1.x' of https://github.com/BrycensRanch/Rokon dbe14c00982b08eef49a2c94c173f6cebb6e0c39 branch 'feat/bsd-package' of https://github.com/BrycensRanch/Rokon 7c0d0fefae353d98c4ac193aabb66b4e87b170b7 branch 'feat/roku-discover' of https://github.com/BrycensRanch/Rokon a2009e298f03aaaede978eab2918ac191b18145b branch 'feat/roku-discover-2' of https://github.com/BrycensRanch/Rokon -4e8deb8bae90b2fee8731fb18ac33f0c2f34ede0 branch 'master' of https://github.com/BrycensRanch/Rokon +ae656e99f66fb2f4561f60477819fb1c208219a3 branch 'master' of https://github.com/BrycensRanch/Rokon a29243f15d13d5ba742346b31efc7ee8d4c3205c branch 'origin/master' of https://github.com/BrycensRanch/Rokon 95fcfcdc9da3bcfdeca71b5fead33f3da5bcdf6a branch 'renovate/configure' of https://github.com/BrycensRanch/Rokon diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/ORIG_HEAD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/ORIG_HEAD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/ORIG_HEAD 2024-11-01 19:06:34.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/ORIG_HEAD 2024-11-01 14:49:54.000000000 +0000 @@ -1 +1 @@ -18457b65f193d12defd2e4840d59c5a4c5a0b287 +880a544ace16cb8848ea71e46e055df601723040 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/config /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/config --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/config 2024-11-01 19:06:34.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/config 2024-11-01 14:49:56.000000000 +0000 @@ -20,5 +20,5 @@ gpgsign = false [http "https://github.com/"] - extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzX3Fxc2J4bzJBR2lXcUxvaDl6VlF3NjlSV2c4UHBSazFlSEdscQ== + extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzXzVxdDBVd3NSbE5KOGhDNTZTdWlsWFJXaGszWUJvMjNPNDQwTw== [branch "master"] remote = origin Binary files /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/index and /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/index differ diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/heads/master /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/heads/master --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/heads/master 2024-11-01 19:06:34.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/heads/master 2024-11-01 14:49:56.000000000 +0000 @@ -1 +1 @@ -4e8deb8bae90b2fee8731fb18ac33f0c2f34ede0 +ae656e99f66fb2f4561f60477819fb1c208219a3 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/dep/github.com-adrg-xdg-0.x /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/dep/github.com-adrg-xdg-0.x --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/dep/github.com-adrg-xdg-0.x 2024-11-01 19:06:34.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/dep/github.com-adrg-xdg-0.x 2024-11-01 14:49:56.000000000 +0000 @@ -1 +1 @@ -2885583da330f9ccf332c3c8eecae336befd4140 +2a84ccfa4df6533b6326ecd496e8a01a5bb431d7 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/master /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/master --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/master 2024-11-01 19:06:34.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/master 2024-11-01 14:49:56.000000000 +0000 @@ -1 +1 @@ -4e8deb8bae90b2fee8731fb18ac33f0c2f34ede0 +ae656e99f66fb2f4561f60477819fb1c208219a3 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.github/workflows/build-on-other-arches.yml /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.github/workflows/build-on-other-arches.yml --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.github/workflows/build-on-other-arches.yml 2024-11-01 19:01:42.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.github/workflows/build-on-other-arches.yml 2024-11-01 14:49:56.000000000 +0000 @@ -115,5 +115,8 @@ githubToken: ${{ secrets.GITHUB_TOKEN }} install: | - dnf install -y clang git gtk4-devel gobject-introspection-devel go wget shc + dnf install -y clang git gtk4-devel gobject-introspection-devel go wget + wget https://github.com/megastep/makeself/releases/download/release-2.5.0/makeself-2.5.0.run + chmod +x *.run + mv *.run /usr/local/bin run: | git config --global --add safe.directory '*' @@ -152,5 +155,4 @@ path: | *.run - *.run.zsync - name: 🗃️ Upload Built Tarball 📦 uses: actions/upload-artifact@v4 @@ -203,5 +205,8 @@ install: | dnf in -y dnf5 - dnf5 install -y clang git gtk4-devel gobject-introspection-devel go wget shc + dnf5 install -y clang git gtk4-devel gobject-introspection-devel go wget + wget https://github.com/megastep/makeself/releases/download/release-2.5.0/makeself-2.5.0.run + chmod +x *.run + mv *.run /usr/local/bin run: | git config --global --add safe.directory '*' @@ -240,5 +245,4 @@ path: | *.run - *.run.zsync - name: 🗃️ Upload Built Tarball 📦 uses: actions/upload-artifact@v4 @@ -291,5 +295,8 @@ install: | apt update - apt install -y clang make libgtk-4-dev wget libgirepository1.0-dev git golang-go file shc + apt install -y clang make libgtk-4-dev wget libgirepository1.0-dev git golang-go file + wget https://github.com/megastep/makeself/releases/download/release-2.5.0/makeself-2.5.0.run + chmod +x *.run + mv *.run /usr/local/bin run: | git config --global --add safe.directory /home/runner/work/Rokon/Rokon @@ -329,5 +336,4 @@ path: | *.run - *.run.zsync - name: 🗃️ Upload Built Tarball 📦 uses: actions/upload-artifact@v4 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.github/workflows/publish.yml /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.github/workflows/publish.yml --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.github/workflows/publish.yml 2024-11-01 19:06:34.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.github/workflows/publish.yml 2024-11-01 04:01:14.000000000 +0000 @@ -59,5 +59,6 @@ done sudo pacman -Syu --needed --noconfirm git go gtk4 base-devel gnupg wget curl bash gobject-introspection namcap - yay -Syu --noconfirm shc + wget https://github.com/megastep/makeself/releases/download/release-2.5.0/makeself-2.5.0.run + chmod +x *.run - name: 👁️ Ensure Code is Linted continue-on-error: true @@ -119,5 +120,4 @@ path: | *.run - *.run.zsync - name: 🗃️ Upload Built ArchLinux Package 📦 uses: actions/upload-artifact@v4 @@ -138,4 +138,5 @@ - name: 🗃️ Upload Vendored Source uses: actions/upload-artifact@v4 + if: always() with: name: rokon-vendored-source diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.gitignore /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.gitignore --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.gitignore 2024-11-01 18:56:54.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.gitignore 2024-10-30 01:16:42.000000000 +0000 @@ -24,5 +24,5 @@ *.dmg dmg/ -*.pkg* +*.pkg *.nupkg *.tar.gz @@ -33,6 +33,5 @@ *.tgz *.7z -*.run* -./shellc* +*.run *.log *.zip @@ -75,6 +74,6 @@ # Rokon does not use the src convention and never will. src -*.x.c -*.rtf* + +*.rtf *.txt .ptmp* diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/Makefile /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/Makefile --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/Makefile 2024-11-01 19:06:34.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/Makefile 2024-11-01 14:49:56.000000000 +0000 @@ -67,27 +67,36 @@ METAINFODIR = $(DESTDIR)$(PREFIX)/share/metainfo TARBALLDIR ?= ./tarball -SANITYCHECK ?= 1 +SANITYCHECK = 1 RUNDIR ?= ./run RUNLIBS ?= $(RUNDIR)/libs ABS_RUNDIR := $(shell realpath $(RUNDIR)) -# Check if selfextract exists in the PATH -SELFEXTRACT := $(shell command -v selfextract 2> /dev/null) - -# Determine the selfextract path based on environment variables -ifneq ($(GOBIN),) - SELFEXTRACT_PATH := $(GOBIN)/selfextract -else ifneq ($(GOPATH),) - SELFEXTRACT_PATH := $(GOPATH)/bin/selfextract -else - # Fallback to the safe default - SELFEXTRACT_PATH := $(HOME)/go/bin/selfextract # Safe default path -endif - -# If selfextract command is found in the specified path -ifeq ($(wildcard $(SELFEXTRACT_PATH)),) - SELFEXTRACT := $(SELFEXTRACT_PATH) -else - SELFEXTRACT := $(SELFEXTRACT_PATH) -endif +MAKESELF := $(shell \ + if ls ./makeself*.run > /dev/null 2>&1; then \ + ./makeself*.run --quiet --noexec; \ + rm ./makeself*.run; \ + echo "makeself*/makeself.sh"; \ + elif [ -f ./makeself*/makeself.sh ]; then \ + echo "./makeself*/makeself.sh"; \ + elif command -v makeself > /dev/null; then \ + echo "makeself"; \ + elif command -v makeself.sh > /dev/null; then \ + echo "makeself.sh"; \ + else \ + found=false; \ + for cmd in $$(echo $$PATH | tr ':' ' '); do \ + for file in "$$cmd/makeself"*.run; do \ + if [ -f "$$file" ]; then \ + $$file --quiet --noexec; \ + rm $$file; \ + echo "makeself*/makeself.sh"; \ + found=true; \ + break 2; \ + fi; \ + done; \ + done; \ + if [ "$$found" = false ]; then \ + echo ""; \ + fi; \ + fi) @@ -122,9 +131,11 @@ ldd -d -r $1 | awk '{print $$3}' | grep -v 'not found' | while read -r dep; do \ if [ -n "$$dep" ]; then \ - cp -L --no-preserve=mode "$$dep" $2 || { echo "Failed to copy $$dep"; exit 1; }; \ + echo "Copying dependency: $$dep"; \ + cp -L --no-preserve=mode -v "$$dep" $2 || { echo "Failed to copy $$dep"; exit 1; }; \ fi; \ ldd -d -r "$$dep" | awk '{print $$3}' | grep -v 'not found' | while read -r subdep; do \ if [ -n "$$subdep" ]; then \ - cp -L --no-preserve=mode "$$subdep" $2 || { echo "Failed to copy $$subdep"; exit 1; }; \ + echo "Copying sub-dependency: $$subdep"; \ + cp -L --no-preserve=mode -v "$$subdep" $2 || { echo "Failed to copy $$subdep"; exit 1; }; \ fi; \ done; \ @@ -232,6 +243,4 @@ $(call print-target) @echo "Building Rokon Tarball version: $(VERSION)" - @echo "This process requires the following command line utils to work properly: awk, ldd, tar" - @echo "SHELL: $(SHELL) ARCH: $(ARCH)" rm -rf $(TARBALLDIR) || sudo rm -v -rf $(TARBALLDIR) mkdir -p $(TARBALLDIR) @@ -239,14 +248,7 @@ $(MAKE) PACKAGED=true PACKAGEFORMAT=$(TBPKGFMT) EXTRAGOFLAGS="$(EXTRAGOFLAGS) -trimpath" EXTRALDFLAGS="$(EXTRALDFLAGS) -s -w -linkmode=external" build $(MAKE) PREFIX=$(TARBALLDIR) APPLICATIONSDIR=$(TARBALLDIR) install - cp ./windows/portable.txt $(TARBALLDIR) + cp -v ./windows/portable.txt $(TARBALLDIR) $(call copy_deps,$(TARBALLDIR)/bin/$(TARGET),$(TBLIBSDIR)) $(call make_wrapper_script,$(TARBALLDIR)) - @if command -v shc > /dev/null; then \ - echo "shc found. Turning wrapper script into binary"; \ - shc -r -S -f $(TARBALLDIR)/$(TARGET) -o $(TARBALLDIR)/$(TARGET) - rm $(TARBALLDIR)/*.x.c # Clean residue files - else \ - echo "UPX not found. Skipping compression."; \ - fi @if command -v upx > /dev/null; then \ echo "UPX found. Compressing binaries..."; \ @@ -255,4 +257,5 @@ echo "UPX not found. Skipping compression."; \ fi + $(call make_wrapper_script,$(TARBALLDIR)) cd /usr && cp -r --parents -L --no-preserve=mode -r share/glib-2.0/schemas/gschemas.compiled share/X11 share/gtk-4.0 share/icons/Adwaita $(ABS_TARBALLDIR) cd - @@ -276,5 +279,5 @@ tar -czf $(TAR_NAME) $(TARBALLDIR) @if command -v zsyncmake >/dev/null 2>&1; then \ - zsyncmake $(TAR_NAME) -u "gh-releases-zsync|BrycensRanch|Rokon|latest|$(TAR_NAME).zsync"; \ + zsyncmake $(TAR_NAME) -u "gh-releases-zsync|BrycensRanch|Rokon|latest|Rokon-$(UNAME_S)-*-$(ARCH).tar.gz.zsync"; \ else \ echo "zsyncmake not found. Please install it to generate the zsync file."; \ @@ -284,27 +287,13 @@ endif -.ONESHELL: -.PHONY: check_selfextract -check_selfextract: - @if [ ! -x "$(SELFEXTRACT_PATH)" ]; then \ - echo "selfextract command not found in $(SELFEXTRACT_PATH), installing..."; \ - cd tools && go get github.com/synthesio/selfextract && go install -v github.com/synthesio/selfextract; \ - cd -; \ - echo "selfextract installed..."; \ - else \ - echo "Using selfextract located at: $(SELFEXTRACT_PATH)"; \ - fi - -.ONESHELL: .PHONY: run run: ## create run "package" $(call print-target) - $(MAKE) check_selfextract - rm $(RUNFILE_NAME) || true + $(if $(MAKESELF),,$(error MAKESELF was NOT detected in $$PATH OR right next to the Makefile)) + rm ./Rokon-$(VERSION)-$(ARCH).run || true $(MAKE) PACKAGED=true PACKAGEFORMAT="run" TBPKGFMT="run" TARBALLDIR=$(RUNDIR) NOTB=1 tarball - cp $(RUNDIR)/$(TARGET) $(RUNDIR)/selfextract_startup - $(SELFEXTRACT) -f $(RUNFILE_NAME) -C $(RUNDIR) . + $(MAKESELF) --sha256 $(RUNDIR) Rokon-$(VERSION)-$(ARCH).run Rokon ./$(TARGET) @if [ "$(SANITYCHECK)" == "1" ]; then \ - ./$(RUNFILE_NAME) --version; \ + ./Rokon-$(VERSION)-$(ARCH).run -- "--version"; \ status=$$?; \ if [ $$status -ne 0 ]; then \ @@ -317,10 +306,5 @@ echo "Secondary Sanity check skipped."; \ fi - @if command -v zsyncmake >/dev/null 2>&1; then \ - zsyncmake $(RUNFILE_NAME) -u "gh-releases-zsync|BrycensRanch|Rokon|latest|$(RUNFILE_NAME).zsync"; \ - else \ - echo "zsyncmake not found. Please install it to generate the zsync file."; \ - fi - @echo "Cheers, the run file was successfully created. It is the file ./$(RUNFILE_NAME) 🚀" + @echo "Cheers, the run file was successfully created. It is the file ./Rokon-$(VERSION)-$(ARCH).run 🚀" .PHONY: dev @@ -420,5 +404,5 @@ build: ## go build -v -o rokon $(call print-target) - @echo "Building version $(VERSION) commit $(COMMIT) on branch $(BRANCH)" + @echo "Building version $(VERSION)" go build -v -ldflags="-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.packaged=$(PACKAGED) -X main.packageFormat=$(PACKAGEFORMAT) -X main.branch=$(BRANCH) $(EXTRALDFLAGS)" $(EXTRAGOFLAGS) -o $(TARGET) -tags "$(BUILDTAGS)" . diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/PKGBUILD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/PKGBUILD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/PKGBUILD 2024-11-01 19:07:20.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/PKGBUILD 2024-11-01 14:52:38.000000000 +0000 @@ -2,5 +2,5 @@ pkgname=rokon -pkgver=1.0.0+4e8deb8 +pkgver=1.0.0+ae656e9 pkgrel=1 epoch=0 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/tools/go.mod /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/tools/go.mod --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/tools/go.mod 2024-11-01 19:06:34.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/tools/go.mod 2024-11-01 14:49:54.000000000 +0000 @@ -93,5 +93,4 @@ github.com/kisielk/errcheck v1.7.0 // indirect github.com/kkHAIKE/contextcheck v1.1.5 // indirect - github.com/klauspost/compress v1.17.9 // indirect github.com/kulti/thelper v0.6.3 // indirect github.com/kunwardeep/paralleltest v1.0.10 // indirect @@ -159,5 +158,4 @@ github.com/stretchr/testify v1.9.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/synthesio/selfextract v0.0.0-20240323225418-337a9cebfd86 // indirect github.com/tdakkota/asciicheck v0.2.0 // indirect github.com/tetafro/godot v1.4.18 // indirect diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/tools/go.sum /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/tools/go.sum --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/tools/go.sum 2024-11-01 19:06:34.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/tools/go.sum 2024-11-01 14:49:54.000000000 +0000 @@ -371,6 +371,4 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/synthesio/selfextract v0.0.0-20240323225418-337a9cebfd86 h1:+jmSLGWWGOr24Vkf2IQdcaSma9y9IRaa0amMvLnl9Cw= -github.com/synthesio/selfextract v0.0.0-20240323225418-337a9cebfd86/go.mod h1:ZBQB+8bol6X0o2hVT4W23/7oKzWhvaW3ea8qkRjcP0A= github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9qkHM= github.com/tdakkota/asciicheck v0.2.0/go.mod h1:Qb7Y9EgjCLJGup51gDHFzbI08/gbGhL/UVhYIPWG2rg=