Scripts: Remove redundant packaging subdirectory

Author: stenzek

.github/workflows/linux-appimage-build.yml

@@ -29,7 +29,7 @@ jobs:
         fetch-depth: 0
 
     - name: Install Packages
-      run: scripts/packaging/appimage/install-packages.sh
+      run: scripts/appimage/install-packages.sh
 
     - name: Cache Dependencies
       id: cache-deps
@@ -75,7 +75,7 @@ jobs:
         cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmakeoptions }} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" ..
         cmake --build . --parallel
         cd ..
-        scripts/packaging/appimage/make-appimage.sh $(realpath .) $(realpath ./build) $HOME/deps "${{ matrix.asset }}"
+        scripts/appimage/make-appimage.sh $(realpath .) $(realpath ./build) $HOME/deps "${{ matrix.asset }}"
 
     - name: Upload AppImage
       uses: actions/upload-artifact@v6

.github/workflows/linux-cross-appimage-build.yml

@@ -90,8 +90,8 @@ jobs:
       shell: bash
       run: |
         cmake --build build --parallel
-        scripts/packaging/appimage/make-cross-appimage.sh duckstation-qt ${{ matrix.arch }} "$(realpath build)" "$HOME/deps/cross" "/${{ matrix.arch }}-chroot"
-        scripts/packaging/appimage/make-cross-appimage.sh -inject-libc duckstation-mini ${{ matrix.arch }} "$(realpath build)" "$HOME/deps/cross" "/${{ matrix.arch }}-chroot"
+        scripts/appimage/make-cross-appimage.sh duckstation-qt ${{ matrix.arch }} "$(realpath build)" "$HOME/deps/cross" "/${{ matrix.arch }}-chroot"
+        scripts/appimage/make-cross-appimage.sh -inject-libc duckstation-mini ${{ matrix.arch }} "$(realpath build)" "$HOME/deps/cross" "/${{ matrix.arch }}-chroot"
 
     - name: Upload AppImages
       uses: actions/upload-artifact@v6

…ripts/packaging/appimage/apprun-cross.sh scripts/appimage/apprun-cross.shscripts/packaging/appimage/apprun-cross.sh renamed to scripts/appimage/apprun-cross.sh scripts/packaging/appimage/apprun-cross.sh renamed to scripts/appimage/apprun-cross.sh

@@ -125,8 +125,8 @@ DEPLOY_PLATFORM_THEMES="1" \
 QMAKE="$DEPSDIR/bin/qmake" \
 NO_STRIP="1" \
 $LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/duckstation-qt" ${EXTRA_LIBS_ARGS[@]} \
---desktop-file="$ROOTDIR/scripts/packaging/org.duckstation.DuckStation.desktop" \
---icon-file="$ROOTDIR/scripts/packaging/org.duckstation.DuckStation.png" \
+--desktop-file="$ROOTDIR/scripts/appimage/org.duckstation.DuckStation.desktop" \
+--icon-file="$ROOTDIR/scripts/appimage/org.duckstation.DuckStation.png" \
 
 echo "Copying resources into AppDir..."
 cp -a "$BUILDDIR/bin/resources" "$OUTDIR/usr/bin"
@@ -171,7 +171,7 @@ cp -a "$BUILDDIR/bin/translations" "$OUTDIR/usr/bin"
 # Generate AppStream meta-info.
 echo "Generating AppStream metainfo..."
 mkdir -p "$OUTDIR/usr/share/metainfo"
-"$SCRIPTDIR/../generate-metainfo.sh" "$OUTDIR/usr/share/metainfo"
+"$SCRIPTDIR/generate-metainfo.sh" "$OUTDIR/usr/share/metainfo"
 
 echo "Generating AppImage..."
 rm -f "$ASSETNAME"

scripts/packaging/generate-metainfo.sh scripts/appimage/generate-metainfo.shscripts/packaging/generate-metainfo.sh renamed to scripts/appimage/generate-metainfo.sh

@@ -321,15 +321,15 @@ done
 echo "Copying desktop/icon..."
 mkdir -p "$OUTDIR/usr/share/applications"
 mkdir -p "$OUTDIR/usr/share/icons/hicolor/512x512/apps"
-cp -v "$SCRIPTDIR/../org.duckstation.DuckStation.desktop" "$OUTDIR/usr/share/applications"
-cp -v "$SCRIPTDIR/../org.duckstation.DuckStation.png" "$OUTDIR/usr/share/icons/hicolor/512x512/apps"
+cp -v "$SCRIPTDIR/org.duckstation.DuckStation.desktop" "$OUTDIR/usr/share/applications"
+cp -v "$SCRIPTDIR/org.duckstation.DuckStation.png" "$OUTDIR/usr/share/icons/hicolor/512x512/apps"
 ln -s "usr/share/applications/org.duckstation.DuckStation.desktop" "$OUTDIR"
 ln -s "usr/share/icons/hicolor/512x512/apps/org.duckstation.DuckStation.png" "$OUTDIR"
 
 # Generate AppStream meta-info.
 echo "Generating AppStream metainfo..."
 mkdir -p "$OUTDIR/usr/share/metainfo"
-"$SCRIPTDIR/../generate-metainfo.sh" "$OUTDIR/usr/share/metainfo"
+"$SCRIPTDIR/generate-metainfo.sh" "$OUTDIR/usr/share/metainfo"
 
 # Copy AppRun
 cp "$SCRIPTDIR/apprun-cross.sh" "$OUTDIR/AppRun"