npub1ep…qwugy on Nostr: commit feb0a1a2bffd83cc903fd885469d9bf4f1016dd5 Author: randymcmillan ...

commit feb0a1a2bffd83cc903fd885469d9bf4f1016dd5
Author: randymcmillan <[email protected]>
Date: Sun May 12 20:40:55 2024 -0400

gui:

diff --git a/gui/Cargo.toml b/gui/Cargo.toml
index 4fcee2479..722ffc88e 100644
--- a/gui/Cargo.toml
+++ b/gui/Cargo.toml
@@ -91,7 +91,7 @@ normpath = "1.1"
[package.metadata.deb]
section = "web"
assets = [
- ["target/release/gossip", "/usr/bin/", "755"],
+ ["target/release/gnostr-gui", "/usr/bin/", "755"],
["packaging/debian/gossip.desktop", "/usr/share/applications/gossip.desktop", "644"],
]
features = ["lang-cjk"]
diff --git a/gui/GNUmakefile b/gui/GNUmakefile
index 08022e7fe..46f755b61 100755
--- a/gui/GNUmakefile
+++ b/gui/GNUmakefile
@@ -142,4 +142,5 @@ wasm:
@echo "open http://127.0.0.1:8080/index.html#dev";

-include Makefile
+-include docker.mk
-include act.mk
diff --git a/gui/docker.mk b/gui/docker.mk
index 9276bd57c..e26dbd5bd 100644
--- a/gui/docker.mk
+++ b/gui/docker.mk
@@ -3,7 +3,7 @@ docker:## docker commands
@awk 'BEGIN {FS = ":.*?###### "} /^[a-zA-Z_-]+:.*?###### / {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)

.ONESHELL:
-docker-start:###### detect whether docker is running...
+docker-start:###### detect whether docker is running...
@( \
while ! docker system info > /dev/null 2>&1; do\
echo 'Waiting for docker to start...';\
@@ -16,8 +16,10 @@ docker-start:###### detect whether docker is running...
sleep 1;\
done\
)
-docker-pull:docker-start###### pull alpine image
+docker-pull:docker-start###### pull alpine image
docker pull alpine

+docker-build-debian:###### docker build -f ./packaging/debian/Dockerfile .
+ docker build -f ./packaging/debian/Dockerfile .
# vim: set noexpandtab:
# vim: set setfiletype make
diff --git a/gui/packaging/debian/Dockerfile b/gui/packaging/debian/Dockerfile
index 1b66ee7ae..676c4e2a4 100644
--- a/gui/packaging/debian/Dockerfile
+++ b/gui/packaging/debian/Dockerfile
@@ -12,15 +12,15 @@ RUN apt-get update \
&& apt -y autoremove \
&& apt clean \
&& rm -rf /var/lib/apt/lists/*
-RUN cargo install cargo-deb
+RUN cargo install cargo-deb@^1


# Build gossip
-COPY ./ gossip/
-WORKDIR gossip
-RUN mkdir -p /gossip/artifacts
+COPY . gnostr/
+WORKDIR gnostr
+RUN mkdir -p /gnostr/artifacts
RUN cargo deb
-RUN ls /gossip/target/debian/
+RUN ls /gnostr/target/debian/

FROM scratch as custom-exporter
-COPY --from=builder /gossip/target/debian/gossip*_amd64.deb .
+COPY --from=builder /gnostr/target/debian/gnostr-gui*_amd64.deb .
diff --git a/gui/packaging/debian/gossip.desktop b/gui/packaging/debian/gossip.desktop
index 73a9aa9ba..97535dd94 100644
--- a/gui/packaging/debian/gossip.desktop
+++ b/gui/packaging/debian/gossip.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=gossip
+Name=gnostr-gui
Version=1.0
-Comment=Desktop client for Nostr
-Exec=gossip
+Comment=Part of the gnostr git+nostr workflow utility
+Exec=gnostr-gui
Icon=gossip
Type=Application
Categories=Network;InstantMessaging;
@@ -11,7 +11,7 @@ Terminal=false
MimeType=x-scheme-handler/nostr;
X-GNOME-UsesNotifications=false
# Allows finding Gossip using application launchers and software shops more easily
-Keywords=Nostr
-X-KDE-Keywords=Nostr
+Keywords=nostr
+X-KDE-Keywords=Nostr gnostr
# to be listed properly in some stores
X-Purism-FormFactor=Workstation;Mobile;