Skip to content

Commit

Permalink
Merge pull request #116 from TS3Tools/sbk/Rename-master-branch
Browse files Browse the repository at this point in the history
Rename `master` branch to `main`
  • Loading branch information
Sebbo94BY committed Nov 23, 2022
2 parents 20a95f4 + e1e3dd5 commit ef04c12
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 15 deletions.
10 changes: 5 additions & 5 deletions .updateScript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ sleep 5s
cd "$(dirname $0)"

# Download latest version
wget --no-check-certificate -q https://github.com/TS3Tools/TS3UpdateScript/archive/master.zip
wget --no-check-certificate -q https://github.com/TS3Tools/TS3UpdateScript/archive/main.zip

# Unzip latest version
if [[ $(unzip master.zip TS3UpdateScript-master/* -x TS3UpdateScript-master/configs/*) ]]; then
if [ ! $(cp -Rf TS3UpdateScript-master/* . && rm -rf TS3UpdateScript-master/) ]; then
rm -rf master.zip
if [[ $(unzip main.zip TS3UpdateScript-main/* -x TS3UpdateScript-main/configs/*) ]]; then
if [ ! $(cp -Rf TS3UpdateScript-main/* . && rm -rf TS3UpdateScript-main/) ]; then
rm -rf main.zip
cd - > /dev/null
exit 1;
fi
else
rm -rf master.zip
rm -rf main.zip
cd - > /dev/null
exit 0;
fi
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ If you don't want to update your TeamSpeak 3 server manually, you can use this s

## Various references

![Example Output](https://raw.githubusercontent.com/TS3Tools/TS3UpdateScript/master/img/TS3UpdateScript_Example_Summary.png)
![Example Output](/img/TS3UpdateScript_Example_Summary.png)

[Open CHANGELOG](docs/CHANGELOG.md)

Expand Down Expand Up @@ -59,7 +59,7 @@ If you don't want to update your TeamSpeak 3 server manually, you can use this s
- Pre-Validation of collected data to prevent possible update issues
- Best Practices Analyzer
- Debug feature, if you got some issues with the script
- Debug Report feature, if your update failed (Example [Debug Report](https://raw.githubusercontent.com/TS3Tools/TS3UpdateScript/master/docs/EXAMPLE_DEBUG_REPORT.md))
- Debug Report feature, if your update failed (Example [Debug Report](/docs/EXAMPLE_DEBUG_REPORT.md))

## Stay tuned!

Expand Down Expand Up @@ -151,7 +151,7 @@ Verified:
Need Review:
- None

![Settings summary](https://raw.githubusercontent.com/TS3Tools/TS3UpdateScript/master/img/TS3UpdateScript_Settings_Summary.png)
![Settings summary](/img/TS3UpdateScript_Settings_Summary.png)

### Help us

Expand All @@ -165,7 +165,7 @@ All you need to do to get the list of available options/parameters is:

user@tux:~$ sudo ./TS3UpdateScript --help

![Help menu](https://raw.githubusercontent.com/TS3Tools/TS3UpdateScript/master/img/TS3UpdateScript_Help_Page.png)
![Help menu](/img/TS3UpdateScript_Help_Page.png)

All you need to do to execute an update process is:

Expand Down
2 changes: 1 addition & 1 deletion TS3UpdateScript
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ function getCurrentScriptVersion() {
# Get latest script version
# Return: LatestScriptVersion:string or 1:boolean
function getLatestScriptVersion() {
LATEST_SCRIPT_VERSION="$(wget -t 1 -T 1 https://raw.githubusercontent.com/TS3Tools/TS3UpdateScript/master/docs/CHANGELOG.md --no-check-certificate -q -O - | grep Version | head -1 | cut -d ' ' -f 3 | tr -d '[[:space:]]')"
LATEST_SCRIPT_VERSION="$(wget -t 1 -T 1 https://raw.githubusercontent.com/TS3Tools/TS3UpdateScript/main/docs/CHANGELOG.md --no-check-certificate -q -O - | grep Version | head -1 | cut -d ' ' -f 3 | tr -d '[[:space:]]')"

if [[ -n "$LATEST_SCRIPT_VERSION" ]]; then
echo -n "$LATEST_SCRIPT_VERSION";
Expand Down
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ Hotfix | Important fix for one more issues, which causes a not (correct) working

## Releases

### Version 6.0.1 (2022-11-23)

- Renamed `master` branch to `main`

### Version 6.0.0 (2022-11-20)

- Removed script licensing
Expand Down
6 changes: 3 additions & 3 deletions docs/INSTALL_USAGE_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ First of all, you have to meet the latest [requirements](../README.md#requiremen

a) Download the latest TS3UpdateScript from GitHub.com: https://github.com/TS3Tools/TS3UpdateScript/

``user@tux:~$ wget https://github.com/TS3Tools/TS3UpdateScript/archive/master.zip``
``user@tux:~$ wget https://github.com/TS3Tools/TS3UpdateScript/archive/main.zip``

b) Unzip the downloaded archive on your Linux server:

``user@tux:~$ unzip master.zip && rm master.zip``
``user@tux:~$ unzip main.zip && rm main.zip``

``user@tux:~$ mv TS3UpdateScript-master/ TS3UpdateScript && cd TS3UpdateScript``
``user@tux:~$ mv TS3UpdateScript-main/ TS3UpdateScript && cd TS3UpdateScript``

HINT: You can unzip and use the script from each directory of your server which you want to.

Expand Down
4 changes: 2 additions & 2 deletions docs/UPDATE_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ This file shows you, how you can update the TS3UpdateScript.
2. Read the [docs/CHANGELOG.md](CHANGELOG.md) (important information are marked with a exclamation mark ("!"))
3. Download the latest version from https://github.com/TS3Tools/TS3UpdateScript

``root@tux:~# wget https://github.com/TS3Tools/TS3UpdateScript/archive/master.zip``
``root@tux:~# wget https://github.com/TS3Tools/TS3UpdateScript/archive/main.zip``

4. Unzip and replace all old TS3UpdateScript files excluding the configs/ directory with the latest version

``root@tux:~# unzip master.zip TS3UpdateScript-master/* -x TS3UpdateScript-master/configs/*``
``root@tux:~# unzip main.zip TS3UpdateScript-main/* -x TS3UpdateScript-main/configs/*``

5. Check, if your used parameters have been changed or not and adjust them, if needed (read [docs/CHANGELOG.md](CHANGELOG.md) therefore)

Expand Down

0 comments on commit ef04c12

Please sign in to comment.