diff --git a/installJRMC b/installJRMC index 662637f..37372c0 100755 --- a/installJRMC +++ b/installJRMC @@ -1124,8 +1124,13 @@ install_mc_snap() { echo "snapcraft.yaml created at $snap_yaml" echo "Building snap package..." - if execute snapcraft -v -o "$OUTPUT_DIR/${MC_PKG}_${MC_VERSION}.snap" --destructive-build -d "$snap_dir"; then - echo "Snap package built successfully: $OUTPUT_DIR/${MC_PKG}_${MC_VERSION}.snap" + + if podman run --rm -it \ + -v "$snap_dir:/build" \ + -w /build \ + docker.io/snapcore/snapcraft:stable \ + snapcraft -v -o "${MC_PKG}_${MC_VERSION}-${MC_RELEASE}.snap" --destructive-build; then + echo "Snap package built successfully: $snap_dir/${MC_PKG}_${MC_VERSION}-${MC_RELEASE}.snap" else err "Snap package build failed." return 1 @@ -1133,7 +1138,7 @@ install_mc_snap() { # Offer to install the built snap package if ask_ok "Do you want to install the MC snap package?"; then - if sudo snap install --dangerous "$OUTPUT_DIR/${MC_PKG}_${MC_VERSION}.snap"; then + if execute sudo snap install --dangerous "$snap_dir/${MC_PKG}_${MC_VERSION}-${MC_RELEASE}.snap"; then echo "Snap package installed successfully." else err "Snap installation failed." @@ -1820,10 +1825,8 @@ main() { if ((SNAP_INSTALL_SWITCH)); then acquire_deb || { err "Could not download Media Center DEB package"; return 1; } - install_package snapd + install_package snapd podman execute sudo systemctl enable --now snapd.socket - execute sudo ln -s /var/lib/snapd/snap /snap - execute sudo snap install snapcraft --classic if install_mc_snap; then echo "JRiver Media Center installed successfully from snap" else