Skip to content

Commit cfaa26d

Browse files
committed
fix: harmonisation structure AppDir, desktop et workflow
- Ajout de curl à l'étape d'installation des outils - Correction du chemin Exec dans AM-GUI.desktop (am-gui %U) - Correction du chemin de déploiement dans get-dependencies.sh (linux-unpacked -> AppDir) - quick-sharun appelé sur AppDir/bin dans make-appimage.sh - Nettoyage des commentaires inutiles
1 parent 9b4bee0 commit cfaa26d

File tree

4 files changed

+6
-16
lines changed

4 files changed

+6
-16
lines changed

.github/workflows/appimage.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,11 @@ jobs:
2525
- name: Install build tools
2626
run: |
2727
export DEBIAN_FRONTEND=noninteractive
28-
apt-get update && apt-get install -y build-essential python3 gcc-10 g++-10
28+
apt-get update && apt-get install -y build-essential python3 gcc-10 g++-10 curl
2929
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100
3030
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100
3131
- name: build AM-GUI
32-
run: |
33-
export DEBIAN_FRONTEND=noninteractive
34-
apt-get update && apt-get install -y curl
32+
run: |
3533
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
3634
. "$HOME/.nvm/nvm.sh"
3735
nvm install 22

AM-GUI.desktop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Desktop Entry]
22
Type=Application
33
Name=AM-GUI
4-
Exec=bin/am-gui %U
4+
Exec=am-gui %U
55
Icon=AM-GUI.png
66
StartupWMClass=AM-GUI
77
Terminal=false

scripts/get-dependencies.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,14 @@ pacman -Syu --noconfirm python
1111

1212
echo "Installing debloated packages..."
1313
echo "---------------------------------------------------------------"
14-
get-debloated-pkgs --add-common --prefer-nano
14+
#get-debloated-pkgs --add-common --prefer-nano
1515

1616
# Comment this out if you need an AUR package
1717
#make-aur-package PACKAGENAME
1818

1919
# If the application needs to be manually built that has to be done down here
2020

21-
# Télécharger et installer nodejs/npm via nvm :
22-
#curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
23-
#\. "$HOME/.nvm/nvm.sh"
24-
#nvm install 22
25-
#node -v # Doit afficher "v22.21.1".
26-
#npm -v # Doit afficher "10.9.4".
27-
#npm install
28-
#npm run dist
2921
mkdir -p ./AppDir/bin
30-
cp -rv dist/linux-unpacked/* ./AppDir/bin
22+
cp -rv dist/linux-unpacked/* ./AppDir
3123
cp -v AM-GUI.png ./AppDir/.DirIcon
3224
cp -v AM-GUI.desktop ./AppDir/

scripts/make-appimage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export ADD_HOOKS="self-updater.bg.hook:fix-namespaces.hook"
1010
export UPINFO="gh-releases-zsync|${GITHUB_REPOSITORY%/*}|${GITHUB_REPOSITORY#*/}|latest|*$ARCH.AppImage.zsync"
1111

1212
# Deploy dependencies
13-
quick-sharun ./AppDir
13+
quick-sharun ./AppDir/bin
1414

1515
# Additional changes can be done in between here
1616

0 commit comments

Comments
 (0)