Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DietPi-Live_patches | Fix phpSysInfo install #4621

Merged
merged 2 commits into from
Aug 4, 2021
Merged

DietPi-Live_patches | Fix phpSysInfo install #4621

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1c56ca
v7.4
MichaIng Aug 4, 2021
189cd9f
v7.5
MichaIng Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions .update/version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ G_MIN_DEBIAN=4
# Alternative Git branch to automatically migrate to when Debian version is too low
G_OLD_DEBIAN_BRANCH='jessie-support'
# Live patches
G_LIVE_PATCH_DESC=('This patch fixes the Blynk server install option. You may ignore it if you do not plan to install the Blynk home server.\n\nMore info: https://github.com/MichaIng/DietPi/pull/4594')
G_LIVE_PATCH_COND=("[[ -w '/boot/dietpi/dietpi-software' ]] && grep -q 'blynkkk' /boot/dietpi/dietpi-software")
G_LIVE_PATCH=("sed -i 's/blynkkk/Peterkn2001/' /boot/dietpi/dietpi-software")
G_LIVE_PATCH_DESC=(
[0]='This patch fixes the Blynk server install option. You may ignore it if you do not plan to install the Blynk home server.\n\nMore info: https://github.com/MichaIng/DietPi/pull/4594'
[1]='This patch fixes the phpSysInfo install option. You may ignore it if you do not plan to install the Blynk home server.\n\nMore info: https://github.com/MichaIng/DietPi/pull/4619'
MichaIng marked this conversation as resolved.
Show resolved Hide resolved
)
G_LIVE_PATCH_COND=(
[0]="[[ -w '/boot/dietpi/dietpi-software' ]] && grep -q 'blynkkk' /boot/dietpi/dietpi-software"
[1]="[[ -w '/boot/dietpi/dietpi-software' ]] && grep -q 'phpsysinfo-master' /boot/dietpi/dietpi-software"
)
G_LIVE_PATCH=(
[0]="sed -i 's/blynkkk/Peterkn2001/' /boot/dietpi/dietpi-software"
[1]="sed -Ei 's#phpsysinfo(-|/archive/)master#phpsysinfo\1main#' /boot/dietpi/dietpi-software"
)