mirrors/raspiblitz
1
0
Fork 0
mirror of https://github.com/rootzoll/raspiblitz.git synced 2025-02-28 16:58:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Correct branches for WebUI & API

Browse source
This commit is contained in:
/rootzoll 2024-03-15 15:54:03 +01:00 • committed by GitHub
parent e477377214
commit 14e1201d82
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
FAQ.dev.md
View file

@ -2,6 +2,9 @@
### Steps to create RaspberryPi images with Packer?
* Make sure you have:
* Correct version-string in: `_version.info`
* Correct version-branch as fallback in `build_sdcard.sh`
* Start [`Debian LIVE`](https://cdimage.debian.org/debian-cd/current-live/amd64/iso-hybrid/debian-live-12.4.0-amd64-cinnamon.iso) from USB stick
* On USB boot be sure to start the "LIVE_SYSTEM" image
* Set KeyboardLang, "Screensaver" & "Power Management"

8
build_sdcard.sh
View file

@ -10,8 +10,8 @@
# setup fresh SD card with image above - login via SSH and run this script:
##########################################################################
defaultRepo="raspiblitz" #user that hosts a `raspiblitz` repo
defaultBranch="v1.10"
defaultRepo="raspiblitz" # user that hosts a `raspiblitz` repo
defaultBranch="v1.11" # latest version branch
defaultAPIuser="fusion44"
defaultAPIrepo="blitz_api"
@ -56,8 +56,8 @@ if [ "$EUID" -ne 0 ]; then
fi
if [ "$1" = "-EXPORT" ] || [ "$1" = "EXPORT" ]; then
cd /home/admin/raspiblitz 2>/dev/null
activeBranch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
activeBranch=$(git -C /home/admin/raspiblitz branch --show-current 2>/dev/null)
echo "activeBranch='${activeBranch}'"
if [ "${activeBranch}" == "" ]; then
activeBranch="${defaultBranch}"
fi

2
home.admin/_version.info
View file

@ -1,3 +1,3 @@
# RaspiBlitz Version - always [major].[main].[sub] (sub can be a string like '2rc1')
codeVersion="1.11.0rc4"
# keep last line with comment
# keep last line with comment ---> IF YOU HAVE A NEW VERSION BRANCH > EDIT ALSO buil_sdcard.sh

12
home.admin/config.scripts/blitz.web.api.sh
View file

@ -170,13 +170,15 @@ fi
if [ "$1" = "1" ] || [ "$1" = "on" ]; then
if [ "$2" == "DEFAULT" ]; then
echo "# getting default user/repo from build_sdcard.sh"
echo "# API: getting default user/repo from build_sdcard.sh"
# copy build_sdcard.sh out of raspiblitz diretcory to not create "changes" in git
sudo cp /home/admin/raspiblitz/build_sdcard.sh /home/admin/build_sdcard.sh
sudo chmod +x /home/admin/build_sdcard.sh 2>/dev/null
source <(sudo /home/admin/build_sdcard.sh -EXPORT)
echo "# activeBranch detected by build_sdcard.sh: ${activeBranch}"
GITHUB_USER="${defaultAPIuser}"
GITHUB_REPO="${defaultAPIrepo}"
GITHUB_BRANCH="${githubBranch}"
GITHUB_BRANCH="blitz-${githubBranch}"
GITHUB_COMMITORTAG=""
else
# get parameters
@ -192,17 +194,17 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
echo "# FAIL: No GITHUB_USER provided"
exit 1
fi
echo "GITHUB_REPO(${GITHUB_REPO})"
echo "# GITHUB_REPO(${GITHUB_REPO})"
if [ "${GITHUB_REPO}" == "" ]; then
echo "# FAIL: No GITHUB_REPO provided"
exit 1
fi
echo "GITHUB_BRANCH(${GITHUB_BRANCH})"
echo "# GITHUB_BRANCH(${GITHUB_BRANCH})"
if [ "${GITHUB_BRANCH}" == "" ]; then
echo "# FAIL: No GITHUB_BRANCH provided"
exit 1
fi
echo "GITHUB_COMMITORTAG(${GITHUB_COMMITORTAG})"
echo "# GITHUB_COMMITORTAG(${GITHUB_COMMITORTAG})"
if [ "${GITHUB_COMMITORTAG}" == "" ]; then
echo "# INFO: No GITHUB_COMMITORTAG provided .. will use latest code on branch"
fi

11
home.admin/config.scripts/blitz.web.ui.sh
View file

@ -57,13 +57,14 @@ fi
if [ "$1" = "1" ] || [ "$1" = "on" ]; then
if [ "$2" == "DEFAULT" ]; then
echo "# getting default user/repo from build_sdcard.sh"
echo "# WEBUI: getting default user/repo from build_sdcard.sh"
# copy build_sdcard.sh out of raspiblitz diretcory to not create "changes" in git
sudo cp /home/admin/raspiblitz/build_sdcard.sh /home/admin/build_sdcard.sh
sudo chmod +x /home/admin/build_sdcard.sh 2>/dev/null
source <(sudo /home/admin/build_sdcard.sh -EXPORT)
GITHUB_USER="${defaultWEBUIuser}"
GITHUB_REPO="${defaultWEBUIrepo}"
GITHUB_BRANCH="${githubBranch}"
GITHUB_BRANCH="release/${githubBranch}"
GITHUB_COMMITORTAG=""
else
# get parameters
@ -79,17 +80,17 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
echo "# FAIL: No GITHUB_USER provided"
exit 1
fi
echo "GITHUB_REPO(${GITHUB_REPO})"
echo "# GITHUB_REPO(${GITHUB_REPO})"
if [ "${GITHUB_REPO}" == "" ]; then
echo "# FAIL: No GITHUB_REPO provided"
exit 1
fi
echo "GITHUB_BRANCH(${GITHUB_BRANCH})"
echo "# GITHUB_BRANCH(${GITHUB_BRANCH})"
if [ "${GITHUB_BRANCH}" == "" ]; then
echo "# FAIL: No GITHUB_BRANCH provided"
exit 1
fi
echo "GITHUB_COMMITORTAG(${GITHUB_COMMITORTAG})"
echo "# GITHUB_COMMITORTAG(${GITHUB_COMMITORTAG})"
if [ "${GITHUB_COMMITORTAG}" == "" ]; then
echo "# INFO: No GITHUB_COMMITORTAG provided .. will use latest code on branch"
fi