Spitfire/Builder
Spitfire/Builder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update upload file struct

Browse source
This commit is contained in:
partisan 2024-08-03 22:30:57 +02:00
parent 3a3c48ca49
commit 3da2fe8b22
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -40,11 +40,11 @@ spitfire-browser/
├── browser/ ├── browser/
│ ├── x86_64/ │ ├── x86_64/
│ │ ├── stable/ │ │ ├── stable/
│ │ │ ├── latest/example.tar.gz │ │ │ ├── latest/linux.tar.gz
│ │ │ ├── x.x.x/example.tar.gz │ │ │ ├── x.x.x/linux.tar.gz
│ │ ├── nightly/ │ │ ├── nightly/
│ │ ├── latest/example.tar.gz │ │ ├── latest/linux.tar.gz
│ │ ├── yyyy-mm-dd/example.tar.gz │ │ ├── yyyy-mm-dd/linux.tar.gz
│ ├── arm/ │ ├── arm/
│ │ ├── stable/ │ │ ├── stable/
│ │ │ ├── latest/ │ │ │ ├── latest/
@ -52,7 +52,6 @@ spitfire-browser/
│ │ ├── nightly/ │ │ ├── nightly/
│ │ ├── latest/ │ │ ├── latest/
│ │ ├── yyyy-mm-dd/ │ │ ├── yyyy-mm-dd/
│ ├── README.md
├── cli-package-manager/ ├── cli-package-manager/
│ ├── stable/ │ ├── stable/
│ │ ├── latest/ │ │ ├── latest/
@ -60,7 +59,6 @@ spitfire-browser/
│ ├── nightly/ │ ├── nightly/
│ ├── latest/ │ ├── latest/
│ ├── yyyy-mm-dd/ │ ├── yyyy-mm-dd/
│ ├── README.md
├── gui-installer/ ├── gui-installer/
│ ├── stable/ │ ├── stable/
│ │ ├── latest/ │ │ ├── latest/
@ -68,7 +66,6 @@ spitfire-browser/
│ ├── nightly/ │ ├── nightly/
│ ├── latest/ │ ├── latest/
│ ├── yyyy-mm-dd/ │ ├── yyyy-mm-dd/
│ ├── README.md
├── gui-package-manager/ ├── gui-package-manager/
│ ├── stable/ │ ├── stable/
│ │ ├── latest/ │ │ ├── latest/
@ -76,7 +73,6 @@ spitfire-browser/
│ ├── nightly/ │ ├── nightly/
│ ├── latest/ │ ├── latest/
│ ├── yyyy-mm-dd/ │ ├── yyyy-mm-dd/
│ ├── README.md
├── addons/ ├── addons/
│ ├── themes/ │ ├── themes/
│ │ ├── stable/ │ │ ├── stable/
@ -99,7 +95,5 @@ spitfire-browser/
│ ├── nightly/ │ ├── nightly/
│ ├── latest/ │ ├── latest/
│ ├── yyyy-mm-dd/ │ ├── yyyy-mm-dd/
│ ├── README.md
├── packages.json ├── packages.json
├── README.md
``` ```

26
upload.sh
View file

@ -68,16 +68,10 @@ fi
# Split the target into its components # Split the target into its components
IFS='-' read -r COMPONENT ARCH RELEASE PLATFORM <<< "$TARGET" 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 # Handle versioning
if [ -z "$VERSION" ]; then if [ -z "$VERSION" ]; then
if [[ "$RELEASE" == "nightly" ]]; then if [[ "$RELEASE" == "nightly" ]]; then
VERSION=$(date +"%Y%m%d") VERSION=$(date +"%Y-%m-%d")
elif [[ "$RELEASE" == "stable" ]]; then elif [[ "$RELEASE" == "stable" ]]; then
CURRENT_VERSION=$(grep -oP '(?<="'"$COMPONENT"'": ")([^"]*)' packages.json) CURRENT_VERSION=$(grep -oP '(?<="'"$COMPONENT"'": ")([^"]*)' packages.json)
if [ -n "$CURRENT_VERSION" ]; then 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 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 # Handle compression if specified
if [ "$COMPRESS" = true ]; then if [ "$COMPRESS" = true ]; then
COMPRESSED_FILE="/tmp/${TARGET}.tar.gz" COMPRESSED_FILE="/tmp/${TARGET}.tar.gz"