From e0f7b381a6106b1db9ebc49b6d25a1e039210cf0 Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Mon, 4 Jul 2022 12:10:53 +0200 Subject: [PATCH] AppManager is now loading database from command line argument --- Makefile | 2 +- openbsd/appmanager | 6 +++++- src/Node2D.gd | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9c9bfd0..3f57f11 100644 --- a/Makefile +++ b/Makefile @@ -2,4 +2,4 @@ db: python3 ./build_json.py > src/pkg.json run: db - godot --path src/ + godot --path src/ -- ${PWD}/src/pkg.json diff --git a/openbsd/appmanager b/openbsd/appmanager index 11ba198..42c4e4f 100644 --- a/openbsd/appmanager +++ b/openbsd/appmanager @@ -1,3 +1,7 @@ #!/bin/sh -/usr/local/bin/godot --src /usr/local/share/AppManager/project.godot +DB=$(mktemp -t appmgr_db.XXXXXXXXXXXXXX) + +python3 /usr/local/share/AppManager/build_json.py > "$DB" +/usr/local/bin/godot --src /usr/local/share/AppManager/project.godot -- "$DB" +rm "$DB" diff --git a/src/Node2D.gd b/src/Node2D.gd index aa85c2b..2e437fb 100644 --- a/src/Node2D.gd +++ b/src/Node2D.gd @@ -28,9 +28,10 @@ func get_installed_packages(): func _ready(): get_installed_packages() - + # the last parameter is a path to the packages database + var db_path = OS.get_cmdline_args()[-1] var file = File.new() - file.open("pkg.json", File.READ) + file.open(db_path, File.READ) var content_as_text = file.get_as_text() data = parse_json(content_as_text) $Panel/LineEdit.grab_focus()