From 5ee01d06c0b067f2f07d0288c499897cd0df29f7 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 24 Oct 2023 20:04:19 +0200
Subject: migration tool

---
 base/src/database.rs |  1 +
 base/src/lib.rs      | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'base/src')

diff --git a/base/src/database.rs b/base/src/database.rs
index b8ba28e..739d292 100644
--- a/base/src/database.rs
+++ b/base/src/database.rs
@@ -10,6 +10,7 @@ use std::path::Path;
 use typed_sled::Tree;
 
 pub use sled;
+pub use typed_sled;
 
 pub struct Database {
     pub db: sled::Db,
diff --git a/base/src/lib.rs b/base/src/lib.rs
index 5d96b1a..cfc5a11 100644
--- a/base/src/lib.rs
+++ b/base/src/lib.rs
@@ -5,20 +5,20 @@
 */
 #![feature(lazy_cell)]
 pub mod cache;
+pub mod database;
 pub mod permission;
 pub mod temp;
-pub mod database;
 
 use jellycommon::{config::GlobalConfig, AssetLocation};
 use std::{fs::File, path::PathBuf, sync::LazyLock};
 
 pub static CONF: LazyLock<GlobalConfig> = LazyLock::new(|| {
     serde_yaml::from_reader(
-        File::open(
-            std::env::args()
-                .nth(1)
-                .expect("First argument must specify the configuration to use."),
-        )
+        File::open(std::env::var("JELLYTHING_CONFIG").unwrap_or_else(|_| {
+            std::env::args().nth(1).expect(
+                "First argument or JELLYTHING_CONFIG must specify the configuration to use.",
+            )
+        }))
         .unwrap(),
     )
     .unwrap()
-- 
cgit v1.2.3-70-g09d2