Skip to content

Commit ef04c12

Browse files
authored
Merge pull request #116 from TS3Tools/sbk/Rename-master-branch
Rename `master` branch to `main`
2 parents 20a95f4 + e1e3dd5 commit ef04c12

File tree

6 files changed

+19
-15
lines changed

6 files changed

+19
-15
lines changed

.updateScript.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ sleep 5s
2323
cd "$(dirname $0)"
2424

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

2828
# Unzip latest version
29-
if [[ $(unzip master.zip TS3UpdateScript-master/* -x TS3UpdateScript-master/configs/*) ]]; then
30-
if [ ! $(cp -Rf TS3UpdateScript-master/* . && rm -rf TS3UpdateScript-master/) ]; then
31-
rm -rf master.zip
29+
if [[ $(unzip main.zip TS3UpdateScript-main/* -x TS3UpdateScript-main/configs/*) ]]; then
30+
if [ ! $(cp -Rf TS3UpdateScript-main/* . && rm -rf TS3UpdateScript-main/) ]; then
31+
rm -rf main.zip
3232
cd - > /dev/null
3333
exit 1;
3434
fi
3535
else
36-
rm -rf master.zip
36+
rm -rf main.zip
3737
cd - > /dev/null
3838
exit 0;
3939
fi

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ If you don't want to update your TeamSpeak 3 server manually, you can use this s
1010

1111
## Various references
1212

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

1515
[Open CHANGELOG](docs/CHANGELOG.md)
1616

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

6464
## Stay tuned!
6565

@@ -151,7 +151,7 @@ Verified:
151151
Need Review:
152152
- None
153153

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

156156
### Help us
157157

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

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

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

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

TS3UpdateScript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ function getCurrentScriptVersion() {
275275
# Get latest script version
276276
# Return: LatestScriptVersion:string or 1:boolean
277277
function getLatestScriptVersion() {
278-
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:]]')"
278+
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:]]')"
279279

280280
if [[ -n "$LATEST_SCRIPT_VERSION" ]]; then
281281
echo -n "$LATEST_SCRIPT_VERSION";

docs/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ Hotfix | Important fix for one more issues, which causes a not (correct) working
2323

2424
## Releases
2525

26+
### Version 6.0.1 (2022-11-23)
27+
28+
- Renamed `master` branch to `main`
29+
2630
### Version 6.0.0 (2022-11-20)
2731

2832
- Removed script licensing

docs/INSTALL_USAGE_GUIDE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ First of all, you have to meet the latest [requirements](../README.md#requiremen
2222

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

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

2727
b) Unzip the downloaded archive on your Linux server:
2828

29-
``user@tux:~$ unzip master.zip && rm master.zip``
29+
``user@tux:~$ unzip main.zip && rm main.zip``
3030

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

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

docs/UPDATE_GUIDE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ This file shows you, how you can update the TS3UpdateScript.
1414
2. Read the [docs/CHANGELOG.md](CHANGELOG.md) (important information are marked with a exclamation mark ("!"))
1515
3. Download the latest version from https://github.com/TS3Tools/TS3UpdateScript
1616

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

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

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

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

0 commit comments

Comments
 (0)