Skip to content

Commit

Permalink
Merge pull request #181 from BassT23/beta-1
Browse files Browse the repository at this point in the history
Beta
  • Loading branch information
BassT23 authored Feb 23, 2025
2 parents 08c2936 + deb2d21 commit e037023
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/issue_stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ contains(github.repository, 'BassT23/Proxmox') }}
steps:
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
ascending: true
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
VERSION="1.8.3"

# Branch
BRANCH="master"
BRANCH="beta"

# Variable / Function
LOCAL_FILES="/etc/ultimate-updater"
Expand Down
2 changes: 1 addition & 1 deletion update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# shellcheck disable=SC2317
# shellcheck disable=SC2320

VERSION="4.3"
VERSION="4.3.1"

# Variable / Function
LOCAL_FILES="/etc/ultimate-updater"
Expand Down
25 changes: 14 additions & 11 deletions welcome-screen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# shellcheck disable=SC1017
# shellcheck disable=SC2034

VERSION="1.5"
VERSION="1.5.1"

# Variable / Function
LOCAL_FILES="/etc/ultimate-updater"
Expand All @@ -31,8 +31,10 @@ VERSION_CHECK () {
DEVELOP_VERSION=$(awk -F'"' '/^VERSION=/ {print $2}' /root/update_develop.sh)
LOCAL_VERSION=$(awk -F'"' '/^VERSION=/ {print $2}' $LOCAL_FILES/update.sh)
if [[ "$BRANCH" == develop ]]; then
echo -e "${OR}*** The Ultimate Updater is on develop branch ***${CL}"
if [[ "$LOCAL_VERSION" < "$MASTER_VERSION" ]]; then
if [[ ! -s /root/update_develop.sh ]]; then
echo -e "${OR}*** You are offline - can't check version ***${CL}\n"
echo -e "${OR}*** The Ultimate Updater is on develop branch ***${CL}"
elif [[ "$LOCAL_VERSION" < "$MASTER_VERSION" ]]; then
echo -e "${OR} *** A newer version is available ***${CL}\n\
Installed: $LOCAL_VERSION / Github-Master: $MASTER_VERSION\n\
${OR}You can update with <update -up>${CL}\n"
Expand All @@ -52,8 +54,10 @@ VERSION_CHECK () {
fi
fi
if [[ "$BRANCH" == beta ]]; then
echo -e "${OR}*** The Ultimate Updater is on beta branch ***${CL}"
if [[ "$LOCAL_VERSION" < "$MASTER_VERSION" ]]; then
if [[ ! -s /root/update_beta.sh ]]; then
echo -e "${OR}*** You are offline - can't check version ***${CL}\n"
echo -e "${OR}*** The Ultimate Updater is on beta branch ***${CL}"
elif [[ "$LOCAL_VERSION" < "$MASTER_VERSION" ]]; then
echo -e "${OR} *** A newer version is available ***${CL}\n\
Installed: $LOCAL_VERSION / Github-Master: $MASTER_VERSION\n\
${OR}You can update with <update -up>${CL}\n"
Expand All @@ -73,18 +77,17 @@ VERSION_CHECK () {
fi
fi
if [[ "$BRANCH" == master ]]; then
if [[ "$LOCAL_VERSION" < "$MASTER_VERSION" ]]; then
if [[ ! -s /root/update_master.sh ]]; then
echo -e "${OR}*** You are offline - can't check version ***${CL}\n"
elif [[ "$LOCAL_VERSION" < "$MASTER_VERSION" ]]; then
echo -e "${OR} *** A newer version is available ***${CL}\n\
Installed: $LOCAL_VERSION / Server: $MASTER_VERSION\n\
${OR}You can update with <update -up>${CL}\n"
VERSION_NOT_SHOW=true
else
echo -e "${GN} The Ultimate Updater is UpToDate${CL}"
fi
fi
elif [[ ! -s /root/update_master.sh ]]; then
echo -e "${OR} *** You are offline - can't check version ***${CL}"
elif [[ "$BRANCH" == master ]]; then
echo -e "${GN} The Ultimate Updater is UpToDate${CL}"
fi
if [[ "$VERSION_NOT_SHOW" != true ]]; then echo -e " Version: $LOCAL_VERSION\n"; fi
rm -rf /root/update_master.sh
rm -rf /root/update_beta.sh
Expand Down

0 comments on commit e037023

Please sign in to comment.