From dbc3f0cd83a5a1ac4680fa41b379200ccd268928 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 22 Nov 2021 08:16:32 -0500
Subject: [PATCH 01/15] Update var.py

---
 src/gam/var.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gam/var.py b/src/gam/var.py
index 9a83ab76..3b5a4af6 100644
--- a/src/gam/var.py
+++ b/src/gam/var.py
@@ -8,7 +8,7 @@ import platform
 import re
 
 GAM_AUTHOR = 'Jay Lee <jay0lee@gmail.com>'
-GAM_VERSION = '6.10'
+GAM_VERSION = '6.11'
 GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 GAM_URL = 'https://git.io/gam'

From b75ad006f1d63a486d3af3dea3f87511a5205a9f Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 22 Nov 2021 08:26:33 -0500
Subject: [PATCH 02/15] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2cbec922..5877ee41 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -92,7 +92,7 @@ jobs:
           path: |
             ~/python
             ~/ssl
-          key: ${{ matrix.os }}-${{ matrix.jid }}-20211030
+          key: ${{ matrix.os }}-${{ matrix.jid }}-20211122
 
       - name: Set env variables
         env:

From a47ef0e1f595229b5a37213bcf871dd13c54d83d Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 22 Nov 2021 15:41:05 -0500
Subject: [PATCH 03/15] Update build.yml

---
 .github/workflows/build.yml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5877ee41..d80f3bba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -161,8 +161,13 @@ jobs:
              echo "pip=$pip" >> $GITHUB_ENV
              echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
              echo -e "Python: $python\nPip: $pip\nLD_LIB...: $LD_LIBRARY_PATH"
-             $pip install --upgrade pip
-             $pip install wheel
+             if [ $GAMOS == "macos" ]; then
+               export pipoptions='--nobnary ":all:"'
+               export MACOSX_DEPLOYMENT_TARGET="10.9"
+               export CFLAGS="-arch arm64 -arch x86_64"
+             fi
+             $pip install --upgrade pip $pipoptions
+             $pip install wheel $pipoptions
              export url="https://codeload.github.com/pyinstaller/pyinstaller/tar.gz/${PYINSTALLER_VERSION}"
              echo "Downloading ${url}"
              curl -o pyinstaller.tar.gz --compressed "${url}"
@@ -180,7 +185,11 @@ jobs:
                $python ./waf all $TARGETARCH
                cd ..
              fi
-             $pip install .
+             if [ $GAMOS == "macos" ]; then
+               $pip install pyinstaller $pipoptions
+             else
+               $pip install .
+             fi
              #$python setup.py install
              #$pip install pyinstaller
 
@@ -188,9 +197,13 @@ jobs:
         if: matrix.os != 'self-hosted'
         run: |
              set +e
-             $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 $pip install -U --force-reinstall
-
-             $pip install --upgrade -r requirements.txt
+             if [ $GAMOS == "macos" ]; then
+               export pipoptions='--nobnary ":all:"'
+               export MACOSX_DEPLOYMENT_TARGET="10.9"
+               export CFLAGS="-arch arm64 -arch x86_64"
+             fi
+             $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 $pip install -U --force-reinstall $pipoptions
+             $pip install --upgrade -r requirements.txt $pipoptions
 
       - name: Build GAM with PyInstaller
         if: matrix.goal != 'test'

From 65a740569c7d102fb622ab8e45946afa0fd4d7ab Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 22 Nov 2021 16:16:28 -0500
Subject: [PATCH 04/15] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d80f3bba..96c42489 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -162,7 +162,7 @@ jobs:
              echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
              echo -e "Python: $python\nPip: $pip\nLD_LIB...: $LD_LIBRARY_PATH"
              if [ $GAMOS == "macos" ]; then
-               export pipoptions='--nobnary ":all:"'
+               export pipoptions='--no-binary ":all:"'
                export MACOSX_DEPLOYMENT_TARGET="10.9"
                export CFLAGS="-arch arm64 -arch x86_64"
              fi

From 7e582ac1fc7b328408f3cbb72cf9390ab188e9d0 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 22 Nov 2021 16:19:34 -0500
Subject: [PATCH 05/15] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 96c42489..ac1bd666 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -198,7 +198,7 @@ jobs:
         run: |
              set +e
              if [ $GAMOS == "macos" ]; then
-               export pipoptions='--nobnary ":all:"'
+               export pipoptions='--no-binary ":all:"'
                export MACOSX_DEPLOYMENT_TARGET="10.9"
                export CFLAGS="-arch arm64 -arch x86_64"
              fi

From 90a921279336bd16946acd65af71714e7c207f33 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 22 Nov 2021 16:28:10 -0500
Subject: [PATCH 06/15] Update build.yml

---
 .github/workflows/build.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ac1bd666..7e24c096 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -173,7 +173,7 @@ jobs:
              curl -o pyinstaller.tar.gz --compressed "${url}"
              tar xf pyinstaller.tar.gz
              cd "pyinstaller-${PYINSTALLER_VERSION}/"
-             if [ $GAMOS == "windows" ]; then
+             if [ $GAMOS != "linux" ]; then
                # remove pre-compiled bootloaders so we fail if bootloader compile fails
                rm -rf PyInstaller/bootloader/*bit
                cd bootloader
@@ -185,11 +185,7 @@ jobs:
                $python ./waf all $TARGETARCH
                cd ..
              fi
-             if [ $GAMOS == "macos" ]; then
-               $pip install pyinstaller $pipoptions
-             else
-               $pip install .
-             fi
+             $pip install .
              #$python setup.py install
              #$pip install pyinstaller
 

From fd5a1faa583a4753645ab5ce9ef11a64cb5e5596 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 22 Nov 2021 16:31:44 -0500
Subject: [PATCH 07/15] Update gam.spec

---
 src/gam.spec | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gam.spec b/src/gam.spec
index 64f418c5..8d5bbcaf 100644
--- a/src/gam.spec
+++ b/src/gam.spec
@@ -33,6 +33,11 @@ for d in a.datas:
 
 pyz = PYZ(a.pure)
 
+if sys.platform == "darwin":
+     target_arch="universal2"
+else:
+     target_arch=None
+
 exe = EXE(pyz,
           a.scripts,
           a.binaries,
@@ -42,4 +47,5 @@ exe = EXE(pyz,
           debug=False,
           strip=None,
           upx=False,
+          target_arch=target_arch,
           console=True)

From e91d12caaff9a77ff938432cbf59cdd1621891d6 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 23 Nov 2021 08:26:12 -0500
Subject: [PATCH 08/15] Update macos-install.sh

---
 .github/actions/macos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/macos-install.sh b/.github/actions/macos-install.sh
index 76b38e5c..fe050fce 100755
--- a/.github/actions/macos-install.sh
+++ b/.github/actions/macos-install.sh
@@ -7,7 +7,7 @@ export distpath="dist/"
 export gampath="${distpath}gam"
 rm -rf $gampath
 export specfile="gam.spec"
-$python -OO -m PyInstaller --clean --noupx --strip --distpath "${gampath}" --target-architecture $PLATFORM "${specfile}"
+$python -OO -m PyInstaller --distpath "${gampath}" "${specfile}"
 export gam="${gampath}/gam"
 $gam version extended
 export GAMVERSION=`$gam version simple`

From f5dec96ffb5a71af4105f3eab9183a3134fd4acd Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 23 Nov 2021 08:31:32 -0500
Subject: [PATCH 09/15] Update README.md

---
 README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index efc4bdaa..5e3948fb 100644
--- a/README.md
+++ b/README.md
@@ -14,14 +14,6 @@ bash <(curl -s -S -L https://git.io/install-gam)
 
 this will download GAM, install it and start setup.
 
-To install with `pip`, run
-
-```sh
-pip install git+https://github.com/jay0lee/GAM.git#subdirectory=src
-```
-
-This will only download and install GAM. To start setup, simply invoke the `gam` CLI.
-
 ## Windows
 
 Download the MSI Installer from the [GitHub Releases] page. Install the MSI and you'll be prompted to setup GAM.

From 0d94bae0b59bcf5ca59c4c0f27c9edf028c571d6 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 23 Nov 2021 08:33:40 -0500
Subject: [PATCH 10/15] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5e3948fb..9001ec7d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-GAM is a command line tool for Google Workspace (fka G Suite) Administrators to manage domain and user settings quickly and easily.
+GAM is a command line tool for Google Workspace Administrators to manage domain and user settings quickly and easily.
 
 ![Build Status](https://github.com/jay0lee/GAM/workflows/Build%20and%20test%20GAM/badge.svg)
 

From 3e833419db58dee944e6b4ea4b51652cbeade2b9 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 23 Nov 2021 08:33:53 -0500
Subject: [PATCH 11/15] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9001ec7d..cd40a64e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-GAM is a command line tool for Google Workspace Administrators to manage domain and user settings quickly and easily.
+GAM is a command line tool for Google Workspace admins to manage domain and user settings quickly and easily.
 
 ![Build Status](https://github.com/jay0lee/GAM/workflows/Build%20and%20test%20GAM/badge.svg)
 

From 5f618a7f651ecdc8a725a6d145da228cfa324d86 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 23 Nov 2021 08:41:50 -0500
Subject: [PATCH 12/15] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7e24c096..17610ad0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ env:
   MIN_OPENSSL_VERSION: "1.1.1l"
   PATCHELF_VERSION: "0.13"
   # PYINSTALLER_VERSION can be full commit hash or version like v4.20
-  PYINSTALLER_VERSION: "6eae2c7cf93a968ddc054339e0cb3063f90d0e64"
+  PYINSTALLER_VERSION: "41842f5ad31dd33d7ba4ae03daace2287c80dcb7"
 
 jobs:
   build:

From 30c5e92de693975617e29c5cf6252b0fb30a2a8a Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 23 Nov 2021 10:15:54 -0500
Subject: [PATCH 13/15] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 17610ad0..e2ad1d74 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -92,7 +92,7 @@ jobs:
           path: |
             ~/python
             ~/ssl
-          key: ${{ matrix.os }}-${{ matrix.jid }}-20211122
+          key: ${{ matrix.os }}-${{ matrix.jid }}-20211123
 
       - name: Set env variables
         env:

From d84f8418ff9468e7f237cbb929d2f551eb274127 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 23 Nov 2021 10:39:56 -0500
Subject: [PATCH 14/15] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e2ad1d74..d461a396 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -173,7 +173,7 @@ jobs:
              curl -o pyinstaller.tar.gz --compressed "${url}"
              tar xf pyinstaller.tar.gz
              cd "pyinstaller-${PYINSTALLER_VERSION}/"
-             if [ $GAMOS != "linux" ]; then
+             if [ $GAMOS == "windows" ]; then
                # remove pre-compiled bootloaders so we fail if bootloader compile fails
                rm -rf PyInstaller/bootloader/*bit
                cd bootloader

From f55a344b7ac926bb40a9339b56f505781f74274e Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 23 Nov 2021 10:48:03 -0500
Subject: [PATCH 15/15] Update build.yml

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d461a396..04c86583 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -162,7 +162,7 @@ jobs:
              echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
              echo -e "Python: $python\nPip: $pip\nLD_LIB...: $LD_LIBRARY_PATH"
              if [ $GAMOS == "macos" ]; then
-               export pipoptions='--no-binary ":all:"'
+               #export pipoptions='--no-binary ":all:"'
                export MACOSX_DEPLOYMENT_TARGET="10.9"
                export CFLAGS="-arch arm64 -arch x86_64"
              fi
@@ -173,7 +173,7 @@ jobs:
              curl -o pyinstaller.tar.gz --compressed "${url}"
              tar xf pyinstaller.tar.gz
              cd "pyinstaller-${PYINSTALLER_VERSION}/"
-             if [ $GAMOS == "windows" ]; then
+             if [ $GAMOS != "linux" ]; then
                # remove pre-compiled bootloaders so we fail if bootloader compile fails
                rm -rf PyInstaller/bootloader/*bit
                cd bootloader
@@ -194,7 +194,7 @@ jobs:
         run: |
              set +e
              if [ $GAMOS == "macos" ]; then
-               export pipoptions='--no-binary ":all:"'
+               #export pipoptions='--no-binary ":all:"'
                export MACOSX_DEPLOYMENT_TARGET="10.9"
                export CFLAGS="-arch arm64 -arch x86_64"
              fi