From dba83d3a5739a6f3decf1a6ffc98c88ea4d6417d Mon Sep 17 00:00:00 2001 From: ook37 Date: Sun, 24 Nov 2024 15:29:41 -0500 Subject: [PATCH 1/3] ref(*): drop `_archive` usage from all `-app` packages --- packages/bazecor-app/bazecor-app.pacscript | 2 +- packages/joplin-desktop-app/joplin-desktop-app.pacscript | 2 +- packages/krita-app/krita-app.pacscript | 2 +- packages/librewolf-app/librewolf-app.pacscript | 2 +- packages/lunarclient-app/lunarclient-app.pacscript | 4 ++-- .../minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript | 4 ++-- packages/mymonero-app/mymonero-app.pacscript | 2 +- packages/neovim-app/neovim-app.pacscript | 2 +- packages/rpcs3-app/rpcs3-app.pacscript | 2 +- packages/suyu-app/suyu-app.pacscript | 2 +- packages/texstudio-app/texstudio-app.pacscript | 2 +- packages/tutanota-app/tutanota-app.pacscript | 2 +- packages/upscayl-app/upscayl-app.pacscript | 2 +- packages/walc-app/walc-app.pacscript | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/bazecor-app/bazecor-app.pacscript b/packages/bazecor-app/bazecor-app.pacscript index f566475a39..c2840c9805 100644 --- a/packages/bazecor-app/bazecor-app.pacscript +++ b/packages/bazecor-app/bazecor-app.pacscript @@ -17,7 +17,7 @@ maintainer=("Elsie19 ") repology=("project: bazecor") package() { - cd "${_archive}" + cd "${srcdir}" mkdir -p "${pkgdir}/usr/share/icons/hicolor/256x256/apps/" "${pkgdir}/usr/share/applications/" echo "[Desktop Entry] Name=Bazecor diff --git a/packages/joplin-desktop-app/joplin-desktop-app.pacscript b/packages/joplin-desktop-app/joplin-desktop-app.pacscript index ef584d7140..4da44a5caf 100644 --- a/packages/joplin-desktop-app/joplin-desktop-app.pacscript +++ b/packages/joplin-desktop-app/joplin-desktop-app.pacscript @@ -19,7 +19,7 @@ arch=("amd64") maintainer=("lfromanini ") package() { - cd "${_archive}" + cd "${srcdir}" install -Dm755 "Joplin-${pkgver}.AppImage" "${pkgdir}/usr/bin/${gives}" install -Dm644 "${srcdir}/joplin-desktop.png" "${pkgdir}/usr/share/pixmaps/joplin-desktop.png" mkdir -p "${pkgdir}/usr/share/applications/" diff --git a/packages/krita-app/krita-app.pacscript b/packages/krita-app/krita-app.pacscript index 6379796f49..cfb2a9ca3e 100644 --- a/packages/krita-app/krita-app.pacscript +++ b/packages/krita-app/krita-app.pacscript @@ -16,7 +16,7 @@ arch=("amd64") maintainer=("harrietobrien ") package() { - cd "${_archive}" + cd "${srcdir}" chmod +x "${gives}-${pkgver}-x86_64.appimage" install -Dm755 "${gives}-${pkgver}-x86_64.appimage" "${pkgdir}/usr/bin/${gives}" install -Dm644 "${srcdir}/krita.svgz" "${pkgdir}/usr/share/pixmaps/krita.svgz" diff --git a/packages/librewolf-app/librewolf-app.pacscript b/packages/librewolf-app/librewolf-app.pacscript index 5e29e8f4a4..5df8f77f87 100644 --- a/packages/librewolf-app/librewolf-app.pacscript +++ b/packages/librewolf-app/librewolf-app.pacscript @@ -37,7 +37,7 @@ package() { gnuarch="aarch64" fi - cd "${_archive}" + cd "${srcdir}" # Install appimage install -Dm755 "LibreWolf.${gnuarch}.AppImage" "${pkgdir}/usr/bin/${gives}" diff --git a/packages/lunarclient-app/lunarclient-app.pacscript b/packages/lunarclient-app/lunarclient-app.pacscript index 59f9aa9644..2d47605fce 100644 --- a/packages/lunarclient-app/lunarclient-app.pacscript +++ b/packages/lunarclient-app/lunarclient-app.pacscript @@ -24,12 +24,12 @@ sha256sums=( ) build() { - cd "${_archive}" + cd "${srcdir}" sed -i "s/REPLACE_VERSION/${pkgver}/" "${srcdir}/${_gives}.desktop" } package() { - cd "${_archive}" + cd "${srcdir}" # AppImage install -Dm755 \ "${_appimage}" \ diff --git a/packages/minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript b/packages/minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript index 123871406e..40ebf7a82a 100644 --- a/packages/minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript +++ b/packages/minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript @@ -20,12 +20,12 @@ maintainer=("cat-master21 <96554164+cat-master21@users.noreply.github.com>") repology=("project: ${gives}") prepare() { - cd "${_archive}" + cd "${srcdir}" mkdir -p "${pkgdir}/usr/bin" "${pkgdir}/usr/share/metainfo" "${pkgdir}/usr/share/applications" "${pkgdir}/usr/share/icons/hicolor/256x256/apps" } package() { - cd "${_archive}" + cd "${srcdir}" install -Dm644 "minecraft-pi-reborn-client-${pkgver}-amd64.AppImage" "${pkgdir}/usr/bin/minecraft-pi-reborn-client" chmod +x "${pkgdir}/usr/bin/minecraft-pi-reborn-client" install -Dm644 "${srcdir}/com.thebrokenrail.MCPIRebornClient.desktop" "${pkgdir}/usr/share/applications/com.thebrokenrail.MCPIRebornClient.desktop" diff --git a/packages/mymonero-app/mymonero-app.pacscript b/packages/mymonero-app/mymonero-app.pacscript index d72f43dd78..79a71679dc 100644 --- a/packages/mymonero-app/mymonero-app.pacscript +++ b/packages/mymonero-app/mymonero-app.pacscript @@ -17,7 +17,7 @@ maintainer=("Elsie19 ") repology=("project: mymonero") package() { - cd "${_archive}" + cd "${srcdir}" install -Dm755 "MyMonero-${pkgver}.AppImage" "${pkgdir}/usr/bin/mymonero" install -Dm644 "${srcdir}/MyMonero.png" "${pkgdir}/usr/share/pixmaps/MyMonero.png" mkdir -p "${pkgdir}/usr/share/applications/" diff --git a/packages/neovim-app/neovim-app.pacscript b/packages/neovim-app/neovim-app.pacscript index 7303529f2c..efa4d6228b 100644 --- a/packages/neovim-app/neovim-app.pacscript +++ b/packages/neovim-app/neovim-app.pacscript @@ -13,7 +13,7 @@ repology=("project: neovim") maintainer=("Elsie19 ") package() { - cd "${_archive}" + cd "${srcdir}" chmod +x nvim.appimage install -Dm755 "nvim.appimage" "${pkgdir}/usr/bin/nvim" } diff --git a/packages/rpcs3-app/rpcs3-app.pacscript b/packages/rpcs3-app/rpcs3-app.pacscript index d7727f413f..cbffe8ca37 100644 --- a/packages/rpcs3-app/rpcs3-app.pacscript +++ b/packages/rpcs3-app/rpcs3-app.pacscript @@ -10,7 +10,7 @@ maintainer=("Thomas Crha ") sha256sums=("470a2998e2f8e545aa3975043983794dcd1a1f07464899b156c9cb32b2dfe2b2") package() { - cd "${_archive}" + cd "${srcdir}" install -Dm755 "rpcs3-v${pkgver}-${pkgsha:0:8}_linux64.AppImage" "${pkgdir}/usr/bin/rpcs3" } # vim:set ft=sh ts=2 sw=2 et: diff --git a/packages/suyu-app/suyu-app.pacscript b/packages/suyu-app/suyu-app.pacscript index 20b6c323fd..f101727b2d 100644 --- a/packages/suyu-app/suyu-app.pacscript +++ b/packages/suyu-app/suyu-app.pacscript @@ -14,7 +14,7 @@ maintainer=("vigress8 ") repology=("project: ${gives}") package() { - cd "${_archive}" + cd "${srcdir}" chmod +x "${appimage}" ./"${appimage}" --appimage-extract usr/share cp -a squashfs-root/usr "${pkgdir}" diff --git a/packages/texstudio-app/texstudio-app.pacscript b/packages/texstudio-app/texstudio-app.pacscript index 423223f999..f4652d6f0b 100644 --- a/packages/texstudio-app/texstudio-app.pacscript +++ b/packages/texstudio-app/texstudio-app.pacscript @@ -12,7 +12,7 @@ repology=("project: ${gives}") maintainer=("vigress8 ") package() { - cd "${_archive}" + cd "${srcdir}" chmod +x "${appimage}" ./"${appimage}" --appimage-extract "${gives}.desktop" &> /dev/null ./"${appimage}" --appimage-extract "${gives}.svg" &> /dev/null diff --git a/packages/tutanota-app/tutanota-app.pacscript b/packages/tutanota-app/tutanota-app.pacscript index 26f1f284b0..d45da8ba91 100644 --- a/packages/tutanota-app/tutanota-app.pacscript +++ b/packages/tutanota-app/tutanota-app.pacscript @@ -21,7 +21,7 @@ repology=("project: tutanota" "repo: homebrew_casks") __created_desktop_file="yes" package() { - cd "${_archive}" + cd "${srcdir}" # Install AppImage install -Dm755 "tutanota-desktop-linux.AppImage" "${pkgdir}/usr/bin/${gives}" diff --git a/packages/upscayl-app/upscayl-app.pacscript b/packages/upscayl-app/upscayl-app.pacscript index 03f561e010..dbf527bea8 100644 --- a/packages/upscayl-app/upscayl-app.pacscript +++ b/packages/upscayl-app/upscayl-app.pacscript @@ -18,7 +18,7 @@ breaks=("${gives}" "${gives}-deb" "${gives}-bin" "${gives}-git") repology=("project: ${gives}") package() { - cd "${_archive}" + cd "${srcdir}" # Install appimage install -Dm755 "Upscayl-${pkgver}-linux.AppImage" "${pkgdir}/usr/bin/${gives}" diff --git a/packages/walc-app/walc-app.pacscript b/packages/walc-app/walc-app.pacscript index e370216ea1..9dc6323744 100644 --- a/packages/walc-app/walc-app.pacscript +++ b/packages/walc-app/walc-app.pacscript @@ -16,7 +16,7 @@ sha256sums=("6c1e5c004e9c4bc5a8cf15837ce0e6c884fb3ace6397aa6aa95a6738c1960560") breaks=("${gives}" "${gives}-bin" "${gives}-git" "${gives}-deb") package() { - cd "${_archive}" + cd "${srcdir}" # Install binary install -Dm755 "${gives}.AppImage" "${pkgdir}/usr/bin/${gives}" } From 565c730ab641c084de31f6444b800a43adb45d8b Mon Sep 17 00:00:00 2001 From: ook37 Date: Sun, 24 Nov 2024 15:42:14 -0500 Subject: [PATCH 2/3] fix this one --- packages/minecraft-pi-reborn-app/.SRCINFO | 1 + .../minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript | 1 + srclist | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/minecraft-pi-reborn-app/.SRCINFO b/packages/minecraft-pi-reborn-app/.SRCINFO index c8fcc8930a..457c956f5f 100644 --- a/packages/minecraft-pi-reborn-app/.SRCINFO +++ b/packages/minecraft-pi-reborn-app/.SRCINFO @@ -3,6 +3,7 @@ pkgbase = minecraft-pi-reborn-app pkgver = 2.5.3 pkgdesc = Minecraft Pi edition reborn with new features and for x86 pc. arch = amd64 + makedepends = desktop-file-utils breaks = minecraft-pi-reborn-git breaks = minecraft-pi-reborn-deb breaks = minecraft-pi-reborn-bin diff --git a/packages/minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript b/packages/minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript index 40ebf7a82a..ef3e6206bd 100644 --- a/packages/minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript +++ b/packages/minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript @@ -3,6 +3,7 @@ gives="minecraft-pi-reborn" pkgver="2.5.3" breaks=("${gives}-git" "${gives}-deb" "${gives}-bin" "minecraft-pi-reborn-client") pkgdesc="Minecraft Pi edition reborn with new features and for x86 pc." +makedepends=('desktop-file-utils') sha256sums=( "f00e77a85fbab907af274416fb1c4b78216c1c49a992eeeb54378269a5171156" "SKIP" diff --git a/srclist b/srclist index 3673912454..04d8062d05 100644 --- a/srclist +++ b/srclist @@ -6805,6 +6805,7 @@ pkgbase = minecraft-pi-reborn-app pkgver = 2.5.3 pkgdesc = Minecraft Pi edition reborn with new features and for x86 pc. arch = amd64 + makedepends = desktop-file-utils breaks = minecraft-pi-reborn-git breaks = minecraft-pi-reborn-deb breaks = minecraft-pi-reborn-bin From 9adce02256924ea82d80dbc3a6bf463f5e3353e5 Mon Sep 17 00:00:00 2001 From: oklopfer <104327997+oklopfer@users.noreply.github.com> Date: Sun, 24 Nov 2024 16:14:15 -0500 Subject: [PATCH 3/3] Update minecraft-pi-reborn-app.pacscript --- .../minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript b/packages/minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript index ef3e6206bd..d26b184004 100644 --- a/packages/minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript +++ b/packages/minecraft-pi-reborn-app/minecraft-pi-reborn-app.pacscript @@ -32,5 +32,8 @@ package() { install -Dm644 "${srcdir}/com.thebrokenrail.MCPIRebornClient.desktop" "${pkgdir}/usr/share/applications/com.thebrokenrail.MCPIRebornClient.desktop" install -Dm644 "${srcdir}/com.thebrokenrail.MCPIRebornClient.appdata.xml" "${pkgdir}/usr/share/metainfo/com.thebrokenrail.MCPIRebornClient.appdata.xml" install -Dm644 "${srcdir}/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/com.thebrokenrail.MCPIRebornClient.png" +} + +post_install() { update-desktop-database -q }