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.

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

Adjust software $json_data to match recent changes #339

Draft
wants to merge 32 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
720956d
update parsing with new data points
Tearran Dec 25, 2024
319f7a2
revert name
Tearran Dec 25, 2024
847f28a
fix missed
Tearran Dec 25, 2024
582ceac
added missing module_cockpit.sh
Tearran Dec 26, 2024
fd52baa
mv config.software.json to config.temp.json
Tearran Dec 26, 2024
a7c3072
removed config.help.json
Tearran Dec 26, 2024
9c0c6a7
rename strings
Tearran Dec 26, 2024
f1a22a1
style
Tearran Dec 26, 2024
36a4506
new file: tools/json/config.software.json
Tearran Dec 26, 2024
3a8b062
Merge branch 'main' into json_data
Tearran Dec 26, 2024
c70b06e
test
Tearran Dec 26, 2024
c9ef40f
worflow test
Tearran Dec 26, 2024
c3d742b
test2 workflow
Tearran Dec 26, 2024
91e5bbd
test3
Tearran Dec 26, 2024
0f6e817
test4
Tearran Dec 26, 2024
74fa73c
fix
Tearran Dec 26, 2024
9b42bd8
test5
Tearran Dec 26, 2024
9c09354
test6
Tearran Dec 26, 2024
096142a
test7
Tearran Dec 26, 2024
ed74197
test8
Tearran Dec 26, 2024
20c0f6e
revert
Tearran Dec 26, 2024
93de28a
fix conflits
Tearran Jan 4, 2025
8b58839
Merge branch 'main' into json_data
Tearran Jan 4, 2025
5623805
fix conflits
Tearran Jan 4, 2025
b1b51af
fix conflits
Tearran Jan 4, 2025
c26b01f
remove test file
Tearran Jan 4, 2025
8aa5dcf
Merge branch 'main' into json_data
Tearran Jan 4, 2025
2796a48
revert change
Tearran Jan 4, 2025
f0a71f2
Merge branch 'main' into json_data
Tearran Jan 8, 2025
c30f768
Merge branch 'main' into json_data
Tearran Jan 10, 2025
f1886c3
Merge branch 'main' into json_data
Tearran Jan 23, 2025
862aa4c
Merge branch 'main' into json_data
Tearran Feb 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions bin/armbian-config
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ lib_dir="$script_dir/../lib/armbian-config"
doc_dir="$script_dir/../share/doc/armbian-config"
json_file="$lib_dir/config.jobs.json"

#
# Load The Bash procedure Objects
json_data=$(<"$json_file")

#
# Prepare the module options array
Expand All @@ -38,7 +35,7 @@ declare -A module_options

source "$lib_dir/config.functions.sh"
set_runtime_variables
check_distro_status
#check_distro_status
echo "Loaded Runtime variables..." #| show_infobox ;
#set_newt_colors 2
echo "Loaded Dialog..." #| show_infobox ;
Expand All @@ -53,8 +50,6 @@ echo "Loaded Software helpers..." #| show_infobox ;
#
# Loads the variables from beta armbian-config for runtime handling

source "$lib_dir/config.runtime.sh"
echo "Loaded Runtime conditions..." #| show_infobox ;

case "$1" in
"--help")
Expand Down
28 changes: 0 additions & 28 deletions tools/json/config.help.json

This file was deleted.

2 changes: 1 addition & 1 deletion tools/json/config.software.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"menu": [
{
"id": "Software",
"id": "Software00",
"description": "Run/Install 3rd party applications",
"sub": [
{
Expand Down
Loading