Skip to content

Commit

Permalink
v6.35
Browse files Browse the repository at this point in the history
+ DietPi-Software | Create_Config: Fix obtaining correct PID for background journalctl to kill and kill it silently
+ DietPi-Software | PaperMC: Do not ask for EULA when it has been accepted before already
  • Loading branch information
MichaIng authored Feb 1, 2021
1 parent ff033b8 commit f79bd8c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -3007,7 +3007,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
G_EXEC_DESC="Starting ${aSOFTWARE_NAME[$software_id]} to pre-create config file in max $timeout seconds" G_EXEC systemctl start "$service"

# Print and follow output of the service startup
[[ $output ]] && journalctl -fu "$service" & pid=$!
[[ $output ]] && { journalctl -fu "$service" & pid=$!; }

# Wait for max $timeout seconds until config file has been created and required content added, if given
local i=0
Expand All @@ -3019,7 +3019,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
done

# Stop journal prints
[[ $output ]] && kill $pid
[[ $output ]] && { kill $pid; wait $pid; } 2> /dev/null

# Stop service
sleep 1
Expand Down Expand Up @@ -6476,7 +6476,7 @@ exec sudo -u $ha_user dash -c '$ha_pyenv_activation; exec pip3 install -U homeas
# Make sure user agrees to the EULA
G_WHIP_BUTTON_OK_TEXT='YES'
G_WHIP_BUTTON_CANCEL_TEXT='NO'
if G_WHIP_YESNO 'Do you agree to the Minecraft EULA found at:\n\nhttps://account.mojang.com/documents/minecraft_eula'
if [[ -f '/mnt/dietpi_userdata/papermc/eula.txt' ]] || 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'
Expand Down

0 comments on commit f79bd8c

Please sign in to comment.