Merge pull request #40 from gamingdoom/unstable

Fix issues related to building, screensharing, and letterboxing

.github/workflows/build-linux-x86_64.yml

@@ -18,7 +18,7 @@ jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

.gitignore

@@ -176,4 +176,5 @@ Datcord-x86_64.AppImage
 
 # Ignore build dir
 build/
+mozilla-unified/
 

buildDatcord.sh

@@ -2,14 +2,25 @@
 
 mozbuild=~/.mozbuild
 export PATH="$PATH:$mozbuild/git-cinnabar"
-echo $PATH
-mkdir mozilla-unified
-if [ -z "$(ls mozilla-unified)" ]; then
-  rm mozilla-unified
+datcordDir=$PWD
+
+if [ ! -d $mozbuild ]; then
+  mkdir $mozbuild
+fi
+
+if [ ! -d mozilla-unified ]; then
+  mkdir mozilla-unified
   curl https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py -O
   python3 bootstrap.py --vcs=git --no-interactive --application-choice=browser_artifact_mode
-  $mozbuild/git-cinnabar/git-cinnabar install
 fi
+
+if [ ! -d $mozbuild/git-cinnabar ]; then
+  git clone https://github.com/glandium/git-cinnabar.git $mozbuild/git-cinnabar
+  cd $mozbuild/git-cinnabar
+  make
+  cd $datcordDir
+fi	
+
 cd mozilla-unified
 cp -r ../changed/* .
 patch -p1 ../mozilla_dirsFromLibreWolf.patch