From 3da2fe8b22579f5bab834f5a2a14a45ce1d1ca3a Mon Sep 17 00:00:00 2001
From: partisan <none@noone.no>
Date: Sat, 3 Aug 2024 22:30:57 +0200
Subject: [PATCH] update upload file struct

---
 README.md | 14 ++++----------
 upload.sh | 26 +++++++++++++++++++-------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 9d461bc..c56e44f 100644
--- a/README.md
+++ b/README.md
@@ -40,11 +40,11 @@ spitfire-browser/
 ├── browser/
 │   ├── x86_64/
 │   │   ├── stable/
-│   │   │   ├── latest/example.tar.gz
-│   │   │   ├── x.x.x/example.tar.gz
+│   │   │   ├── latest/linux.tar.gz
+│   │   │   ├── x.x.x/linux.tar.gz
 │   │   ├── nightly/
-│   │       ├── latest/example.tar.gz
-│   │       ├── yyyy-mm-dd/example.tar.gz
+│   │       ├── latest/linux.tar.gz
+│   │       ├── yyyy-mm-dd/linux.tar.gz
 │   ├── arm/
 │   │   ├── stable/
 │   │   │   ├── latest/
@@ -52,7 +52,6 @@ spitfire-browser/
 │   │   ├── nightly/
 │   │       ├── latest/
 │   │       ├── yyyy-mm-dd/
-│   ├── README.md
 ├── cli-package-manager/
 │   ├── stable/
 │   │   ├── latest/
@@ -60,7 +59,6 @@ spitfire-browser/
 │   ├── nightly/
 │       ├── latest/
 │       ├── yyyy-mm-dd/
-│   ├── README.md
 ├── gui-installer/
 │   ├── stable/
 │   │   ├── latest/
@@ -68,7 +66,6 @@ spitfire-browser/
 │   ├── nightly/
 │       ├── latest/
 │       ├── yyyy-mm-dd/
-│   ├── README.md
 ├── gui-package-manager/
 │   ├── stable/
 │   │   ├── latest/
@@ -76,7 +73,6 @@ spitfire-browser/
 │   ├── nightly/
 │       ├── latest/
 │       ├── yyyy-mm-dd/
-│   ├── README.md
 ├── addons/
 │   ├── themes/
 │   │   ├── stable/
@@ -99,7 +95,5 @@ spitfire-browser/
 │       ├── nightly/
 │           ├── latest/
 │           ├── yyyy-mm-dd/
-│   ├── README.md
 ├── packages.json
-├── README.md
 ```
\ No newline at end of file
diff --git a/upload.sh b/upload.sh
index 8bf95aa..9c6bc68 100755
--- a/upload.sh
+++ b/upload.sh
@@ -68,16 +68,10 @@ fi
 # Split the target into its components
 IFS='-' read -r COMPONENT ARCH RELEASE PLATFORM <<< "$TARGET"
 
-# Determine the upload directory based on the target
-UPLOAD_DIR="$COMPONENT/$ARCH/$RELEASE/$PLATFORM"
-
-# Construct the remote directory path
-REMOTE_DIR="/home/frs/project/$SF_PROJECT/$UPLOAD_DIR"
-
 # Handle versioning
 if [ -z "$VERSION" ]; then
     if [[ "$RELEASE" == "nightly" ]]; then
-        VERSION=$(date +"%Y%m%d")
+        VERSION=$(date +"%Y-%m-%d")
     elif [[ "$RELEASE" == "stable" ]]; then
         CURRENT_VERSION=$(grep -oP '(?<="'"$COMPONENT"'": ")([^"]*)' packages.json)
         if [ -n "$CURRENT_VERSION" ]; then
@@ -98,6 +92,24 @@ fi
 
 jq --arg comp "$COMPONENT" --arg ver "$VERSION" '.[$comp] = $ver' packages.json > packages_temp.json && mv packages_temp.json packages.json
 
+# Determine the upload directory based on the target and version
+if [[ "$RELEASE" == "nightly" ]]; then
+    if [[ "$VERSION" == $(date +"%Y-%m-%d") ]]; then
+        UPLOAD_DIR="$COMPONENT/$ARCH/$RELEASE/latest"
+    else
+        UPLOAD_DIR="$COMPONENT/$ARCH/$RELEASE/$VERSION"
+    fi
+elif [[ "$RELEASE" == "stable" ]]; then
+    if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+$ ]]; then
+        UPLOAD_DIR="$COMPONENT/$ARCH/$RELEASE/$VERSION"
+    else
+        UPLOAD_DIR="$COMPONENT/$ARCH/$RELEASE/latest"
+    fi
+fi
+
+# Construct the remote directory path
+REMOTE_DIR="/home/frs/project/$SF_PROJECT/$UPLOAD_DIR"
+
 # Handle compression if specified
 if [ "$COMPRESS" = true ]; then
     COMPRESSED_FILE="/tmp/${TARGET}.tar.gz"