cleanup: update Windows build script for smtk2ssrf to refer to 'main' branch

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

.github/workflows/android-dockerimage.yml

@@ -33,10 +33,10 @@ jobs:
     - name: set env
       run: |
         v=${{ env.VERSION }}
-        b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
+        b=${{ github.ref }} # -BRANCH suffix, unless the branch is main
         b=${b/refs\/heads\//}
         b=${b,,} # the name needs to be all lower case
-        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
+        if [ $b = "main" ] ; then b="" ; else b="-$b" ; fi
         echo "::set-env name=NAME::subsurface/android-build-container${b}:${v}"
 
     - name: Build and Publish Linux Docker image to Dockerhub

.github/workflows/android.yml

@@ -2,10 +2,10 @@ name: Android
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   buildInContainer:

.github/workflows/ios.yml

@@ -2,10 +2,10 @@ name: iOS
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   mobileBuild:

.github/workflows/linux-bionic-5.9.yml

@@ -2,10 +2,10 @@ name: Ubuntu 18.04 / Qt 5.9
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   buildOnBionic:

.github/workflows/linux-dockerimage.yml

@@ -23,10 +23,10 @@ jobs:
     - name: set env
       run: |
         v=${{ env.VERSION }}
-        b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
+        b=${{ github.ref }} # -BRANCH suffix, unless the branch is main
         b=${b/refs\/heads\//}
         b=${b,,} # the name needs to be all lower case
-        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
+        if [ $b = "main" ] ; then b="" ; else b="-$b" ; fi
         echo "::set-env name=NAME::subsurface/trusty-qt512${b}:${v}"
 
     - name: Build and Publish Linux Docker image to Dockerhub

.github/workflows/linux-eoan-5.12.yml

@@ -2,10 +2,10 @@ name: Ubuntu 19.10 / Qt 5.12
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   buildInContainer:

.github/workflows/linux-trusty-5.12.yml

@@ -2,10 +2,10 @@ name: Ubuntu 14.04 / Qt 5.12 for AppImage
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   buildInContainer:

.github/workflows/mac.yml

@@ -2,10 +2,10 @@ name: Mac
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   desktopBuild:

.github/workflows/mxe-dockerimage-stage1.yml

@@ -26,10 +26,10 @@ jobs:
       run: |
         v=${{ env.VERSION }}
         s=".stage1"
-        b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
+        b=${{ github.ref }} # -BRANCH suffix, unless the branch is main
         b=${b/refs\/heads\//}
         b=${b,,} # the name needs to be all lower case
-        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
+        if [ $b = "main" ] ; then b="" ; else b="-$b" ; fi
         echo "::set-env name=NAME::subsurface/mxe-build-container${b}:${v}${s}"
 
     - name: Build and Publish stage 1 Docker image to Dockerhub

.github/workflows/mxe-dockerimage-stage2.yml

@@ -16,15 +16,15 @@ jobs:
         ref: ${{ github.event.client_payload.target_branch }}
 
       # Grab the version from the event name that we were triggered by and add ".stage1" to find the docker image to start FROM
-      # And create the NAME of the final docker image (including the branch if not master)
+      # And create the NAME of the final docker image (including the branch if not main)
     - name: set env
       run: |
         v=${{ github.event.action }}
         s=".stage1"
-        b=${{ github.event.client_payload.target_branch }} # -BRANCH suffix, unless the branch is master
+        b=${{ github.event.client_payload.target_branch }} # -BRANCH suffix, unless the branch is main
         b=${b/refs\/heads\//}
         b=${b,,} # the name needs to be all lower case
-        if [ "$b" = "master" ] || [ "$b" = "" ] ; then b="" ; else b="-$b" ; fi
+        if [ "$b" = "main" ] || [ "$b" = "" ] ; then b="" ; else b="-$b" ; fi
         echo "::set-env name=VERSION::${v}${s}"
         echo "::set-env name=NAME::subsurface/mxe-build-container${b}:${v}"
 

.github/workflows/windows.yml

@@ -2,10 +2,10 @@ name: Windows
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   buildInContainer:

CODINGSTYLE.md

@@ -402,4 +402,4 @@ match ExtraWhitespace /\s\+$\| \+\ze\t/
 ```
 
 [1]: http://doc.qt.io/qt-5/qstring.html#manipulating-string-data
-[2]: https://github.com/Subsurface/subsurface/blob/master/core/membuffer.h
+[2]: https://github.com/Subsurface/subsurface/blob/main/core/membuffer.h

CONTRIBUTING.md

@@ -12,17 +12,17 @@ If you would like to contribute patches that fix bugs or add new features, that
 
 Here is a very brief introduction on creating commits that you can either send as [pull requests][6] on our main GitHub repository or send as emails to the mailing list. Much more details on how to use git can be found at the [git user manual][7].
 
-Start with getting the latest source.  
-`cd subsurface`  
-`git checkout master`  
-`git pull`  
-ok, now we know you're on the latest version. Create a working branch to keep your development in:  
-`git checkout -b devel`  
-Edit the code (or documentation), compile, test… then create a commit:  
-`git commit -s -a`  
-Depending on your OS this will open a default editor -- usually you can define which by setting the environment variable `GIT_EDITOR`. Here you enter your commit message. The first line is the title of your commit. Keep it brief and to the point. Then a longer explanation (more on this and the fact that we insist on all contributions containing a Signed-off-by: line below).  
-If you want to change the commit message, "git commit --amend" is the way to go. Feel free to break your changes into multiple smaller commits. Then, when you are done there are two directions to go, which one you find easier depends a bit on how familiar you are with GitHub. You can either push your branch to GitHub and create a [pull requests on GitHub][6], or you run  
-`git format-patch master..devel`  
+Start with getting the latest source.
+`cd subsurface`
+`git checkout main`
+`git pull`
+ok, now we know you're on the latest version. Create a working branch to keep your development in:
+`git checkout -b devel`
+Edit the code (or documentation), compile, test… then create a commit:
+`git commit -s -a`
+Depending on your OS this will open a default editor -- usually you can define which by setting the environment variable `GIT_EDITOR`. Here you enter your commit message. The first line is the title of your commit. Keep it brief and to the point. Then a longer explanation (more on this and the fact that we insist on all contributions containing a Signed-off-by: line below).
+If you want to change the commit message, "git commit --amend" is the way to go. Feel free to break your changes into multiple smaller commits. Then, when you are done there are two directions to go, which one you find easier depends a bit on how familiar you are with GitHub. You can either push your branch to GitHub and create a [pull requests on GitHub][6], or you run
+`git format-patch main..devel`
 Which creates a number of files that have names like 0001-Commit-title.patch, which you can then send to our developer mailing list.
 
 When sending code, please either send signed-off patches or a pull request with signed-off commits. If you don't sign off on them, we will not accept them. This means adding a line that says "Signed-off-by: Name \<Email\>" at the end of each commit, indicating that you wrote the code and have the right to pass it on as an open source patch.
@@ -33,16 +33,16 @@ Also, please write good git commit messages. A good commit message looks like th
 
 Header line: explaining the commit in one line
 
-Body of commit message is a few lines of text, explaining things  
-in more detail, possibly giving some background about the issue  
+Body of commit message is a few lines of text, explaining things
+in more detail, possibly giving some background about the issue
 being fixed, etc etc.
 
-The body of the commit message can be several paragraphs, and  
-please do proper word-wrap and keep columns shorter than about  
-74 characters or so. That way "git log" will show things  
+The body of the commit message can be several paragraphs, and
+please do proper word-wrap and keep columns shorter than about
+74 characters or so. That way "git log" will show things
 nicely even when it's indented.
 
-Reported-by: whoever-reported-it  
+Reported-by: whoever-reported-it
 Signed-off-by: Your Name \<you@example.com\>
 
 That header line really should be meaningful, and really should be just one line. The header line is what is shown by tools like gitk and shortlog, and should summarize the change in one readable line of text, independently of the longer explanation.
@@ -86,4 +86,4 @@ In order to make reviews simpler and have contributions merged faster in the cod
 [7]: https://www.kernel.org/pub/software/scm/git/docs/user-manual.html
 [8]: https://gerrit-review.googlesource.com/Documentation/user-signedoffby.html
 [9]: https://subsurface-divelog.org/wp-content/uploads/2011/10/Screenshot-gitk-subsurface-1.png "Example with gitk"
-[10]: https://github.com/Subsurface/subsurface/blob/master/CodingStyle
+[10]: https://github.com/Subsurface/subsurface/blob/main/CODINGSTYLE.md

INSTALL

@@ -21,7 +21,7 @@ repository:
     git clone http://github.com/Subsurface/subsurface.git
 
 You keep it updated by doing:
-    git checkout master
+    git checkout main
     git pull -r
     
    

README.md

@@ -1,4 +1,4 @@
-# Subsurface [![Build Status](https://travis-ci.org/Subsurface-divelog/subsurface.svg?branch=master)](https://travis-ci.org/Subsurface-divelog/subsurface)
+# Subsurface [![Build Status](https://travis-ci.org/Subsurface-divelog/subsurface.svg?branch=main)](https://travis-ci.org/Subsurface-divelog/subsurface)
 
 This is the README file for Subsurface 4.9.5
 

appdata/subsurface.appdata.xml.in

@@ -21,10 +21,10 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/Subsurface/subsurface/master/appdata/main.png</image>
+      <image>https://raw.githubusercontent.com/Subsurface/subsurface/main/appdata/main.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/Subsurface/subsurface/master/appdata/diveplanner.png</image>
+      <image>https://raw.githubusercontent.com/Subsurface/subsurface/main/appdata/diveplanner.png</image>
     </screenshot>
   </screenshots>
   <url type="homepage">https://subsurface-divelog.org</url>

packaging/windows/smtk2ssrf-mxe-build.sh

@@ -35,13 +35,13 @@
 # smtk2ssrf-mxe-build.sh -i
 # should be used.
 #
-# smtk2ssrf-mxe-build.sh -i -t master
+# smtk2ssrf-mxe-build.sh -i -t main
 # This will build a release installer of smtk2ssrf placed in a directory under
 # the win-build directory where it has been launched, named smtk-import. It will
-# build git latest master regardless of subsurface's cross built version.
+# build git latest from the default branch regardless of subsurface's cross built version.
 #
 # smtk2ssrf-mxe-build.sh -b debug
-# This will build *just* a windows binary (no packing) of the latest master.
+# This will build *just* a windows binary (no packing) of the latest default branch.
 # Use with care, this flag *must* match subsurface's build one.
 #
 # smtk2ssrf-mxe-build.sh -i -t v4.6.4 -b relase -d /mnt/data
@@ -172,10 +172,10 @@ make $JOBS >/dev/null && make install || \
 #
 if [ "$AUTO" = "false" ]; then
 	cd "$BASEDIR/subsurface"
-	git reset --hard master && echo -e "$BLUE---> Uncommited changes to Subsurface (if any) dropped$DEFAULT"
-	git checkout master
+	git reset --hard main && echo -e "$BLUE---> Uncommited changes to Subsurface (if any) dropped$DEFAULT"
+	git checkout main
 	if [ ! -z "$GITREPO" ]; then
-		git pull --rebase "$GITREPO" master || aborting "git pull failed, Subsurface not updated"
+		git pull --rebase "$GITREPO" main || aborting "git pull failed, Subsurface not updated"
 	else
 		git pull --rebase || aborting "git pull failed, Subsurface not updated"
 	fi