Skip to content

Commit

Permalink
Merge branch 'dev' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
NatureHog authored Oct 29, 2024
2 parents b955b4b + dec0ebb commit 80c4eee
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .meta/dietpi-survey_report
Original file line number Diff line number Diff line change
Expand Up @@ -732,14 +732,16 @@ shopt -s extglob

aSOFTWARE_NAME9_7=()
aSOFTWARE_NAME9_8=()
aSOFTWARE_NAME9_9=()
for i in "${!aSOFTWARE_NAME9_6[@]}"
do
aSOFTWARE_NAME9_7[i]=${aSOFTWARE_NAME9_6[i]}
aSOFTWARE_NAME9_8[i]=${aSOFTWARE_NAME9_7[i]}
aSOFTWARE_NAME9_9[i]=${aSOFTWARE_NAME9_8[i]}
done

# Pre-create software counter array so that we can see also software (available in newest version) with 0 installs
for i in "${aSOFTWARE_NAME9_8[@]}"
for i in "${aSOFTWARE_NAME9_9[@]}"
do
aSOFTWARE[$i]=0
done
Expand Down
4 changes: 2 additions & 2 deletions .update/version
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# shellcheck disable=SC2034
# Available DietPi version
G_REMOTE_VERSION_CORE=9
G_REMOTE_VERSION_SUB=8
G_REMOTE_VERSION_RC=0
G_REMOTE_VERSION_SUB=9
G_REMOTE_VERSION_RC=-1
# Minimum DietPi version to allow update
G_MIN_VERSION_CORE=7
G_MIN_VERSION_SUB=0
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
v9.9
(2024-11-16)

New software:

Enhancements:

Bug fixes:

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

-----------------------------------------------------------------------------------------------------------

v9.8
(2024-10-17)

Expand Down
4 changes: 2 additions & 2 deletions dietpi/func/dietpi-globals
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
[[ -f '/boot/dietpi/.version' ]] && . /boot/dietpi/.version
# - Assign defaults/code version as fallback
[[ $G_DIETPI_VERSION_CORE ]] || G_DIETPI_VERSION_CORE=9
[[ $G_DIETPI_VERSION_SUB ]] || G_DIETPI_VERSION_SUB=8
[[ $G_DIETPI_VERSION_RC ]] || G_DIETPI_VERSION_RC=0
[[ $G_DIETPI_VERSION_SUB ]] || G_DIETPI_VERSION_SUB=9
[[ $G_DIETPI_VERSION_RC ]] || G_DIETPI_VERSION_RC=-1
[[ $G_GITBRANCH ]] || G_GITBRANCH='master'
[[ $G_GITOWNER ]] || G_GITOWNER='MichaIng'
# - Save current version and Git branch
Expand Down

0 comments on commit 80c4eee

Please sign in to comment.