Skip to content

Commit 726743a

Browse files
committed
adjusted appdata and corresponding config and job files
1 parent bee5b03 commit 726743a

6 files changed

Lines changed: 101 additions & 49 deletions

File tree

.github/workflows/build.yml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,24 @@ jobs:
7777
mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps
7878
mkdir -p AppDir/usr/share/applications
7979
mkdir -p AppDir/usr/share/metainfo
80-
cp appimage/io.github.frequency403.openssh-gui.appdata.xml AppDir/usr/share/metainfo/io.github.frequency403.openssh-gui.appdata.xml
8180
8281
cp ./publish/${{ matrix.asset_name }} AppDir/usr/bin/openssh-gui
8382
chmod +x AppDir/usr/bin/openssh-gui
8483
8584
cp OpenSSH_GUI/Assets/appicon.png AppDir/usr/share/icons/hicolor/256x256/apps/openssh-gui.png
8685
cp OpenSSH_GUI/Assets/appicon.png AppDir/openssh-gui.png
87-
cp openssh-gui.desktop AppDir/openssh-gui.desktop
88-
cp openssh-gui.desktop AppDir/usr/share/applications/openssh-gui.desktop
86+
cp appimage/io.github.frequency403.openssh_gui.metainfo.xml AppDir/usr/share/metainfo/io.github.frequency403.openssh_gui.metainfo.xml
87+
sed -i "s|<release version=\"0.0.0\" date=\"1970-01-01\"/>|<release version=\"${APPSTREAM_VERSION}\" date=\"$(date +%Y-%m-%d)\"/>|" \
88+
AppDir/usr/share/metainfo/io.github.frequency403.openssh_gui.metainfo.xml
89+
90+
appstreamcli make-desktop-file \
91+
AppDir/usr/share/metainfo/io.github.frequency403.openssh_gui.metainfo.xml \
92+
AppDir/usr/share/applications/io.github.frequency403.openssh_gui.desktop
93+
94+
cp AppDir/usr/share/applications/io.github.frequency403.openssh_gui.desktop \
95+
AppDir/io.github.frequency403.openssh_gui.desktop
8996
9097
cp appimage/AppRun AppDir/AppRun
91-
sed -i "s|<release version=\"0.0.0\" date=\"1970-01-01\"/>|<release version=\"${GITHUB_REF_NAME#v}\" date=\"$(date +%Y-%m-%d)\"/>|" \
92-
AppDir/usr/share/metainfo/io.github.frequency403.openssh-gui.appdata.xml
9398
chmod +x AppDir/AppRun
9499
95100
# Build AppImage
@@ -102,6 +107,13 @@ jobs:
102107
name: OpenSSH-GUI-x86_64.AppImage
103108
path: OpenSSH-GUI-x86_64.AppImage
104109

110+
- name: Upload generated desktop file
111+
if: matrix.target == 'linux-x64'
112+
uses: actions/upload-artifact@v4
113+
with:
114+
name: io.github.frequency403.openssh_gui.desktop
115+
path: AppDir/usr/share/applications/io.github.frequency403.openssh_gui.desktop
116+
105117
- name: Upload build artifact
106118
uses: actions/upload-artifact@v4
107119
with:
@@ -135,7 +147,6 @@ jobs:
135147

136148
- name: Prepare extra assets
137149
run: |
138-
cp openssh-gui.desktop artifacts/
139150
cp OpenSSH_GUI/Assets/appicon.png artifacts/
140151
cp LICENSE artifacts/
141152
@@ -166,13 +177,19 @@ jobs:
166177
with:
167178
name: OpenSSH-GUI-linux-x64
168179
path: ./
180+
181+
- name: Download generated desktop file
182+
uses: actions/download-artifact@v4
183+
with:
184+
name: io.github.frequency403.openssh_gui.desktop
185+
path: ./
169186

170187
- name: Update PKGBUILD for openssh-gui-bin
171188
run: |
172189
VERSION=${GITHUB_REF_NAME#v}
173190
SHA_BIN=$(sha256sum OpenSSH-GUI-linux-x64 | cut -d' ' -f1)
174191
SHA_ICON=$(sha256sum OpenSSH_GUI/Assets/appicon.png | cut -d' ' -f1)
175-
SHA_DESKTOP=$(sha256sum openssh-gui.desktop | cut -d' ' -f1)
192+
SHA_DESKTOP=$(sha256sum io.github.frequency403.openssh_gui.desktop | cut -d' ' -f1)
176193
SHA_LICENSE=$(sha256sum LICENSE | cut -d' ' -f1)
177194
178195
sed -i "s/^pkgver=.*/pkgver=$VERSION/" openssh-gui-bin/PKGBUILD

.github/workflows/staging.yml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,25 @@ jobs:
9292
mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps
9393
mkdir -p AppDir/usr/share/applications
9494
mkdir -p AppDir/usr/share/metainfo
95-
cp appimage/io.github.frequency403.openssh-gui.appdata.xml AppDir/usr/share/metainfo/io.github.frequency403.openssh-gui.appdata.xml
96-
95+
9796
cp ./publish/${{ matrix.asset_name }} AppDir/usr/bin/openssh-gui
9897
chmod +x AppDir/usr/bin/openssh-gui
9998
10099
cp OpenSSH_GUI/Assets/appicon.png AppDir/usr/share/icons/hicolor/256x256/apps/openssh-gui.png
101100
cp OpenSSH_GUI/Assets/appicon.png AppDir/openssh-gui.png
102-
cp openssh-gui.desktop AppDir/openssh-gui.desktop
103-
cp openssh-gui.desktop AppDir/usr/share/applications/openssh-gui.desktop
104-
105-
cp appimage/AppRun AppDir/AppRun
106101
APPSTREAM_VERSION="${VERSION//+/~}"
102+
cp appimage/io.github.frequency403.openssh_gui.metainfo.xml AppDir/usr/share/metainfo/io.github.frequency403.openssh_gui.metainfo.xml
107103
sed -i "s|<release version=\"0.0.0\" date=\"1970-01-01\"/>|<release version=\"${APPSTREAM_VERSION}\" date=\"$(date +%Y-%m-%d)\"/>|" \
108-
AppDir/usr/share/metainfo/io.github.frequency403.openssh-gui.appdata.xml
104+
AppDir/usr/share/metainfo/io.github.frequency403.openssh_gui.metainfo.xml
105+
106+
appstreamcli make-desktop-file \
107+
AppDir/usr/share/metainfo/io.github.frequency403.openssh_gui.metainfo.xml \
108+
AppDir/usr/share/applications/io.github.frequency403.openssh_gui.desktop
109+
110+
cp AppDir/usr/share/applications/io.github.frequency403.openssh_gui.desktop \
111+
AppDir/io.github.frequency403.openssh_gui.desktop
112+
113+
cp appimage/AppRun AppDir/AppRun
109114
chmod +x AppDir/AppRun
110115
111116
ARCH=x86_64 ./appimagetool --appimage-extract-and-run AppDir OpenSSH-GUI-nightly-x86_64.AppImage
@@ -116,6 +121,13 @@ jobs:
116121
with:
117122
name: OpenSSH-GUI-nightly-x86_64.AppImage
118123
path: OpenSSH-GUI-nightly-x86_64.AppImage
124+
125+
- name: Upload generated desktop file
126+
if: matrix.target == 'linux-x64'
127+
uses: actions/upload-artifact@v4
128+
with:
129+
name: io.github.frequency403.openssh_gui.desktop
130+
path: AppDir/usr/share/applications/io.github.frequency403.openssh_gui.desktop
119131

120132
- name: Upload build artifact
121133
uses: actions/upload-artifact@v4
@@ -196,6 +208,12 @@ jobs:
196208
with:
197209
name: OpenSSH-GUI-nightly-linux-x64
198210
path: ./
211+
212+
- name: Download generated desktop file
213+
uses: actions/download-artifact@v4
214+
with:
215+
name: io.github.frequency403.openssh_gui.desktop
216+
path: ./
199217

200218
- name: Update PKGBUILD for openssh-gui-nightly
201219
run: |
@@ -204,10 +222,9 @@ jobs:
204222
BASE_VERSION=$(grep -oPm1 '(?<=<BaseVersion>)[^<]+' Directory.Build.props)
205223
VERSION="${BASE_VERSION}.${DATE}.${HASH}"
206224
echo "VERSION=$VERSION" >> "$GITHUB_ENV"
207-
208225
SHA_BIN=$(sha256sum OpenSSH-GUI-nightly-linux-x64 | cut -d' ' -f1)
209226
SHA_ICON=$(sha256sum OpenSSH_GUI/Assets/appicon.png | cut -d' ' -f1)
210-
SHA_DESKTOP=$(sha256sum openssh-gui.desktop | cut -d' ' -f1)
227+
SHA_DESKTOP=$(sha256sum io.github.frequency403.openssh_gui.desktop | cut -d' ' -f1)
211228
SHA_LICENSE=$(sha256sum LICENSE | cut -d' ' -f1)
212229
213230
sed -i "s/^pkgver=.*/pkgver=$VERSION/" openssh-gui-nightly/PKGBUILD

appimage/io.github.frequency403.openssh-gui.appdata.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<component type="desktop-application">
3+
<id>io.github.frequency403.openssh_gui</id>
4+
5+
<name>OpenSSH GUI</name>
6+
<summary>A graphical user interface for OpenSSH key management</summary>
7+
8+
<metadata_license>MIT</metadata_license>
9+
<project_license>MIT</project_license>
10+
11+
<description>
12+
<p>
13+
An intuitive graphical interface for OpenSSH, designed for Windows, Linux, and Mac users. Built entirely in
14+
C#, this open-source tool simplifies managing SSH connections, keys, and configurations.
15+
</p>
16+
<p>
17+
Whether you&apos;re a network administrator, developer, or a casual user, OpenSSH-GUI eliminates the
18+
complexity of command-line SSH interactions while retaining the power of OpenSSH. Explore a streamlined
19+
experience for secure remote access and system management.
20+
</p>
21+
<p>
22+
Empower your workflow today with OpenSSH-GUI.
23+
</p>
24+
</description>
25+
26+
<launchable type="desktop-id">io.github.frequency403.openssh_gui.desktop</launchable>
27+
<screenshots>
28+
<screenshot type="default">
29+
<image>https://raw.githubusercontent.com/frequency403/OpenSSH-GUI/master/images/NewMainUI.png</image>
30+
</screenshot>
31+
<screenshot>
32+
<image>https://raw.githubusercontent.com/frequency403/OpenSSH-GUI/master/images/MainWindow.png</image>
33+
</screenshot>
34+
</screenshots>
35+
36+
<icon type="stock">opensshgui</icon>
37+
<releases>
38+
<release version="0.0.0" date="1970-01-01"/>
39+
</releases>
40+
41+
<categories>
42+
<category>System</category>
43+
<category>Security</category>
44+
</categories>
45+
46+
<provides>
47+
<binary>openssh-gui</binary>
48+
</provides>
49+
</component>

openssh-gui-bin/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ provides=('openssh-gui')
1111
conflicts=('openssh-gui' 'openssh-gui-git' 'openssh-gui-nightly')
1212
source=("${pkgname}-${pkgver}::${url}/releases/download/v${pkgver}/OpenSSH-GUI-linux-x64"
1313
"${pkgname}-icon-${pkgver}.png::${url}/raw/v${pkgver}/OpenSSH_GUI/Assets/appicon.png"
14-
"${pkgname}-desktop-${pkgver}.desktop::${url}/raw/v${pkgver}/openssh-gui.desktop"
14+
"${pkgname}-desktop-${pkgver}.desktop::${url}/raw/v${pkgver}/io.github.frequency403.openssh_gui.desktop"
1515
"${pkgname}-license-${pkgver}::${url}/raw/v${pkgver}/LICENSE")
1616
sha256sums=('6fb2a77a39be10e0b4d880d24c15563f258f05ffa98d6423e9042e085854f755' 'de5104be112173655a8a5950a4b129e0f28d94e29b80239bf7c82360c524bf9c' '9d73c85e0e47fddf9e8930b42caf0f89b39df7f6088a9ca1a08d0c5d2ea5ff42' '04765b5ced4962532281a4c40754d25380df5e89e49bf3f0ea9054f05a6ee34a')
1717

openssh-gui-nightly/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ provides=('openssh-gui')
1111
conflicts=('openssh-gui' 'openssh-gui-bin' 'openssh-gui-git')
1212
source=("${pkgname}-${pkgver}::${url}/releases/download/nightly/OpenSSH-GUI-nightly-linux-x64"
1313
"${pkgname}-icon-${pkgver}.png::${url}/raw/develop/OpenSSH_GUI/Assets/appicon.png"
14-
"${pkgname}-desktop-${pkgver}.desktop::${url}/raw/develop/openssh-gui.desktop"
14+
"${pkgname}-desktop-${pkgver}.desktop::${url}/raw/develop/io.github.frequency403.openssh_gui.desktop"
1515
"${pkgname}-license-${pkgver}::${url}/raw/develop/LICENSE")
1616
sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP')
1717

0 commit comments

Comments
 (0)