Merge branch 'main' into v0.3.7

Signed-off-by: link <a624669980@163.com>

.github/workflows/demo.yml

@@ -33,7 +33,7 @@ jobs:
           
       - name: Get old instance and snapshot name, create new instance name
         run: | 
-          echo "OLD_INSTANCE_SNAPSHOT_NAME=$(aws lightsail get-instance-snapshots | grep '"name": "0.3.3-demo-1658402149' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV
+          echo "OLD_INSTANCE_SNAPSHOT_NAME=$(aws lightsail get-instance-snapshots | grep '"name": "casaos-0.3.6-1666150291' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV
           echo "OLD_INSTANCE_NAME=$(aws lightsail get-instances | grep '"name": "CasaOS-Demo-[0-9]' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV
           echo "NEW_INSTANCE_NAME=CasaOS-Demo-$(date +%s)" >> $GITHUB_ENV
           

CHANGELOG.md

@@ -32,8 +32,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Apps] App list update mechanism improved, now you can see the latest apps in App Store immediately.
 - [Storage] Fixed a lot of known issues
 
+### Added
+- [Storage] Disk merge (Beta), you can merge multiple disks into a single storage space (currently you need to enable this feature from the command line)
 
-## [0.3.6-alpha.1] - 2022-09-06
+### Changed
+- [Files] Changed the cache file storage location, now the file upload size is not limited by the system disk capacity.
+- [Scripts] Updated installation and upgrade scripts to support more Debian-based Linux distributions.
+- [Engineering] Refactored Local Storage into a standalone service as part of CasaOS modularization.
+
+### Fixed
+- [Apps] App list update mechanism improved, now you can see the latest apps in App Store immediately.
+- [Storage] Fixed a lot of known issues
+
+
+## [0.3.6] - 2022-09-06
 
 ###  Added
 - [System] Added power and temperature info to performance widget (Intel)

build/scripts/setup/script.d/03-setup-casaos.sh

@@ -45,7 +45,7 @@ SETUP_SCRIPT_FILEPATH="${SETUP_SCRIPT_DIRECTORY}/${SETUP_SCRIPT_FILENAME}"
 
 {
     echo "🟩 Running ${SETUP_SCRIPT_FILENAME}..."
-    $SHELL "${SETUP_SCRIPT_FILEPATH}" "${BUILD_PATH}"
+    $BASH "${SETUP_SCRIPT_FILEPATH}" "${BUILD_PATH}"
 } || {
     echo "🟥 ${SETUP_SCRIPT_FILENAME} failed."
     exit 1

build/sysroot/usr/share/casaos/cleanup/script.d/03-cleanup-casaos.sh

@@ -44,3 +44,4 @@ readonly SETUP_SCRIPT_FILEPATH="${SETUP_SCRIPT_DIRECTORY}/${SETUP_SCRIPT_FILENAM
 
 echo "🟩 Running ${SETUP_SCRIPT_FILENAME}..."
 $SHELL "${SETUP_SCRIPT_FILEPATH}" "${BUILD_PATH}"
+