Renaming bsd to freebsd since all bsds are different

Author: gershnik

.github/workflows/build.yml

@@ -33,9 +33,9 @@ jobs:
         - remote_host: debian-11-armhf
           installer: deb
         - remote_host: freebsd-13.1
-          installer: bsd
+          installer: freebsd
         - remote_host: freebsd-14
-          installer: bsd
+          installer: freebsd
         - remote_host: openbsd-7-5
           installer: openbsd
 
@@ -51,24 +51,24 @@ jobs:
         git fetch --all
         git fetch -f --prune --tags
         git reset --hard ${{ github.sha }}
-        if [[ '${{ matrix.installer }}' == 'bsd' ]]; then
+        if [[ '${{ matrix.installer }}' == 'freebsd' ]]; then
           mkdir -p out
           echo "::group::AMD64"
           [ -d "out/amd64" ] && tools/uncache out/amd64
           cmake -S . -B out/amd64 -DCMAKE_BUILD_TYPE=RelWithDebInfo 
-          installers/bsd/build.py . out/amd64
+          installers/freebsd/build.py . out/amd64
           echo "::endgroup::"
 
           echo "::group::ARM64"
-          installers/bsd/make-toolchain.py arm64 out/toolchain-arm64
+          installers/freebsd/make-toolchain.py arm64 out/toolchain-arm64
           [ -d "out/arm64" ] && tools/uncache out/arm64
           cmake -S . -B out/arm64 -DCMAKE_TOOLCHAIN_FILE=out/toolchain-arm64/toolchain.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo
-          installers/bsd/build.py --arch=aarch64 . out/arm64
+          installers/freebsd/build.py --arch=aarch64 . out/arm64
           echo "::endgroup::"
         elif [[ '${{ matrix.installer }}' == 'openbsd' ]]; then
           [ -d "out" ] && tools/uncache out
           cmake -S . -B out -DCMAKE_BUILD_TYPE=RelWithDebInfo 
-          installers/${{ matrix.installer }}/build.py . out
+          installers/openbsd/build.py . out
         else
           [ -d "out" ] && tools/uncache out
           cmake -S . -B out -DCMAKE_BUILD_TYPE=RelWithDebInfo 

.github/workflows/publish.yml

@@ -33,9 +33,9 @@ jobs:
         - remote_host: debian-11-armhf
           installer: deb
         - remote_host: freebsd-13.1
-          installer: bsd
+          installer: freebsd
         - remote_host: freebsd-14
-          installer: bsd
+          installer: freebsd
         - remote_host: openbsd-7-5
           installer: openbsd
 
@@ -52,19 +52,19 @@ jobs:
         git fetch -f --prune --tags
         git reset --hard ${{ github.sha }}
         export GH_TOKEN=${{ secrets.GITHUB_TOKEN }}
-        if [[ '${{ matrix.installer }}' == 'bsd' ]]; then
+        if [[ '${{ matrix.installer }}' == 'freebsd' ]]; then
           mkdir -p out
           echo "::group::AMD64"
           [ -d "out/amd64" ] && tools/uncache out/amd64
           cmake -S . -B out/amd64 -DCMAKE_BUILD_TYPE=RelWithDebInfo 
-          installers/bsd/build.py --upload-results . out/amd64
+          installers/freebsd/build.py --upload-results . out/amd64
           echo "::endgroup::"
 
           echo "::group::ARM64"
-          installers/bsd/make-toolchain.py arm64 out/toolchain-arm64
+          installers/freebsd/make-toolchain.py arm64 out/toolchain-arm64
           [ -d "out/arm64" ] && tools/uncache out/arm64
           cmake -S . -B out/arm64 -DCMAKE_TOOLCHAIN_FILE=out/toolchain-arm64/toolchain.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo
-          installers/bsd/build.py --arch=aarch64 --upload-results . out/arm64
+          installers/freebsd/build.py --arch=aarch64 --upload-results . out/arm64
           echo "::endgroup::"
         else
           [ -d "out" ] && tools/uncache out

config/bsd/usr/local/etc/newsyslog.conf.d/wsddn.conf renamed to config/freebsd/usr/local/etc/newsyslog.conf.d/wsddn.conf

@@ -50,14 +50,14 @@
 else:
     VERSION = getVersion(builddir)
 
-workdir = builddir / 'stage/bsd'
+workdir = builddir / 'stage/freebsd'
 stagedir = workdir / 'root'
 shutil.rmtree(workdir, ignore_errors=True)
 stagedir.mkdir(parents=True)
 
 installCode(builddir, stagedir / 'usr/local')
 
-shutil.copytree(srcdir / 'config/bsd/usr', stagedir / 'usr', dirs_exist_ok=True)
+shutil.copytree(srcdir / 'config/freebsd/usr', stagedir / 'usr', dirs_exist_ok=True)
 
 copyTemplated(mydir.parent / 'wsddn.conf', stagedir / 'usr/local/etc/wsddn.conf.sample', {
     'SAMPLE_IFACE_NAME': "hn0",
@@ -82,7 +82,7 @@
 prefix: /
 """.lstrip())
 
-with open(workdir / 'plist', 'w') as plist:
+with open(workdir / 'plist', 'w', encoding='utf-8') as plist:
     for item in stagedir.glob('**/*'):
         if not item.is_dir():
     	    print(str(item.relative_to(stagedir)), file=plist)