Skip to content

Commit

Permalink
Merge branch 'dev' into dev-StS_RemoveNetworkTools
Browse files Browse the repository at this point in the history
  • Loading branch information
StephanStS authored Jan 6, 2025
2 parents 72e8699 + e0430a7 commit eb93416
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/dietpi-software.bash
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ do
38|40|48|54|55|57|59|76|79|82|90|160|210) Process_Software 88 89 webserver;;
159) Process_Software 36 37 65 88 89 96 121 124 128 129 152 160 163 webserver;;
47|114|168) Process_Software 88 89 91 webserver;;
8|33|131|179|206) Process_Software 196;;
8|33|131|179|181|206) Process_Software 196;;
32|148|119) Process_Software 128;;
129) Process_Software 88 89 128 webserver;;
49|165|177) Process_Software 0 17 88;;
Expand Down Expand Up @@ -390,6 +390,11 @@ G_EXEC rm rootfs/root/.ssh/known_hosts
# Apply software IDs to install
for i in $SOFTWARE; do G_CONFIG_INJECT "AUTO_SETUP_INSTALL_SOFTWARE_ID=$i" "AUTO_SETUP_INSTALL_SOFTWARE_ID=$i" rootfs/boot/dietpi.txt; done

# Enable unattended PaperMC install
G_EXEC mkdir -p rootfs/mnt/dietpi_userdata/papermc/plugins
G_EXEC eval 'echo '\''eula=true'\'' > rootfs/mnt/dietpi_userdata/papermc/eula.txt'
G_EXEC touch rootfs/mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot.jar

# Workaround for "Could not execute systemctl: at /usr/bin/deb-systemd-invoke line 145." during Apache2 DEB postinst in 32-bit ARM Bookworm container: https://lists.ubuntu.com/archives/foundations-bugs/2022-January/467253.html
G_CONFIG_INJECT 'AUTO_SETUP_WEB_SERVER_INDEX=' 'AUTO_SETUP_WEB_SERVER_INDEX=-2' rootfs/boot/dietpi.txt

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ Bug fixes:
- DietPi-Software | Raspotify: Resolved an issue where the service failed to start, if Avahi-Daemon was not installed. librespot has it as new default DNS discovery backend, and official pre-compiled Raspotify binaries are not compiled with the old DNS-SD backend anymore. Avahi-Daemon is hence installed now by DietPi-Software as well. Many thanks to @gergokis for reporting this issue: https://github.com/MichaIng/DietPi/issues/7323
- DietPi-Software | Navidrome: Resolved an issue where the service failed to start, since the latest release archive does not ship with the needed permissions. Many thanks to @nclro for reporting this issue: https://github.com/MichaIng/DietPi/issues/7336
- DietPi-Software | Home Assistant: Worked around an issue where the installation failed on ARMv6 and RISC-V systems, due to an incompatibility between two dependencies. Many thanks to @jankkhvej for reporting this issue: https://github.com/MichaIng/DietPi/issues/7329
- DietPi-Software | PaperMC: Resolved an issue where the installation failed, because the API URL changed. Many thanks to @onkeld for reporting this issue: https://github.com/MichaIng/DietPi/issues/7349
- DietPi-Software | PaperMC: Resolved an issue where the installation failed on Bullseye and Bookworm systems, as Minecraft 1.21 requires Java 21, available on Debian Trixie only. PaperMC 1.20.4 will be installed in those cases now, the latest version which supports Java 17. As a side note: In the same turn, the installation has been re-enabled on ARMv6 systems, using PaperMC 1.16.5, the latest one supporting Java 8.

As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/ADDME

Expand Down
17 changes: 10 additions & 7 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -945,9 +945,7 @@ Available commands:
aSOFTWARE_CATX[$software_id]=5
aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/gaming/#papermc'
aSOFTWARE_DEPS[$software_id]='196'
aSOFTWARE_INTERACTIVE[$software_id]=1
# - ARMv6 as of Java 16+ need
aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
[[ -f '/mnt/dietpi_userdata/papermc/eula.txt' ]] || aSOFTWARE_INTERACTIVE[$software_id]=1
#------------------
software_id=62
aSOFTWARE_NAME[$software_id]='Box86'
Expand Down Expand Up @@ -11440,22 +11438,27 @@ _EOF_
# Make sure user agrees to the EULA
if [[ -f '/mnt/dietpi_userdata/papermc/eula.txt' ]] || G_WHIP_BUTTON_OK_TEXT='Yes' G_WHIP_BUTTON_CANCEL_TEXT='Abort' G_WHIP_YESNO 'Do you agree to the Minecraft EULA found at:\n\nhttps://account.mojang.com/documents/minecraft_eula'
then
# Collect latest version of PaperMC
local url='https://papermc.io/api/v2/projects/paper'
local version=$(curl -sSfL "$url"); version=${version%\"*} version=${version##*\"}
# Collect latest build of latest supported version of PaperMC
local url='https://api.papermc.io/v2/projects/paper'
# - Minecraft 1.20.5 and above requires Java 21: https://minecraft.wiki/w/Java_Edition_1.20.5
local version='1.20.4'
# - ARMv6: Minecraft 1.17 requires Java 16: https://minecraft.wiki/w/Java_Edition_1.17
(( $G_HW_ARCH == 1 )) && version='1.16.5'
(( $G_HW_ARCH > 1 && $G_DISTRO > 7 )) && { version=$(curl -sSfL "$url"); version=${version%\"*}; version=${version##*\"}; }
local build=$(curl -sSfL "$url/versions/$version"); build=${build%]*} build=${build##*[,[]}
#local file=$(curl -sSfL "$url/versions/$version/builds/$build"); file=${file##*\"name\":\"} file=${file%%\"*}
# Download and install PaperMC
Download_Install "$url/versions/$version/builds/$build/downloads/paper-$version-$build.jar" /opt/papermc/paperclip.jar
G_EXEC mkdir -p /mnt/dietpi_userdata/papermc
G_EXEC eval 'echo "eula=true" > /mnt/dietpi_userdata/papermc/eula.txt'
G_EXEC eval 'echo '\''eula=true'\'' > /mnt/dietpi_userdata/papermc/eula.txt'

# User
Create_User -d /mnt/dietpi_userdata/papermc papermc

# Bedrock compatibility
G_WHIP_BUTTON_OK_TEXT='Yes'
G_WHIP_BUTTON_CANCEL_TEXT='Skip'
[[ -f '/mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot.jar' ]] && G_WHIP_DEFAULT_ITEM='Yes'
if G_WHIP_YESNO 'Would you like to install the Geyser and Floodgate plugins for compatibility with Bedrock Edition?\n\nNote that this may be buggy.'
then
Download_Install 'https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest/downloads/spigot' /mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot.jar
Expand Down

0 comments on commit eb93416

Please sign in to comment.