From bb7db069faa0ddd85589224601b02f08c2cb81b2 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 6 Apr 2024 12:40:21 -0700
Subject: Update CI and packaging scripts

---
 setup/default.xml | 2 +-
 setup/package.sh  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index 95bb1f04b..092b4f494 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -11,7 +11,7 @@
     -->
 
     <entry key='web.port'>8082</entry>
-    <entry key='web.path'>./modern</entry>
+    <entry key='web.path'>./web</entry>
     <entry key='web.sanitize'>false</entry>
     <entry key='web.persistSession'>false</entry>
     <entry key='web.showUnknownDevices'>true</entry>
diff --git a/setup/package.sh b/setup/package.sh
index f8ec927eb..533015475 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -85,14 +85,13 @@ else
 fi
 
 prepare () {
-  mkdir -p out/{conf,data,lib,logs,legacy,modern,schema,templates}
+  mkdir -p out/{conf,data,lib,logs,web,schema,templates}
 
   cp ../target/tracker-server.jar out
   cp ../target/lib/* out/lib
   cp ../schema/* out/schema
   cp -r ../templates/* out/templates
-  cp -r ../traccar-web/web/* out/legacy
-  cp -r ../traccar-web/modern/build/* out/modern
+  cp -r ../traccar-web/build/* out/web
   cp default.xml out/conf
   cp traccar.xml out/conf
 
-- 
cgit v1.2.3