install cleanup

GAM-team · Mar 22, 2019 · 964dddf · 964dddf
1 parent 267d679
commit 964dddf
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 20 deletions.
diff --git a/gyb-setup.bat b/gyb-setup.bat
@@ -2,20 +2,6 @@
 @set /p adminemail= "Please enter your Google email address: "
 
 :createproject
-@echo(
-@set /p yn= "Are you a G Suite admin backup/restoring mail for your users? [y or n] "
-@if /I "%yn%"=="n" (
-@  echo(
-@  echo If you want to backup G Suite users, you can create an API project later by running:
-@  echo(
-@  echo gyb --action create-project --email %adminemail%
-@  goto alldone
-   )
-@if /I not "%yn%"=="y" (
-@  echo(
-@  echo Please answer y or n.
-@  goto createproject
-   )
 @gyb --action create-project --email %adminemail%
 @if not ERRORLEVEL 1 goto projectdone
 @echo(
@@ -25,7 +11,7 @@
 
 :saauth
 @echo(
-@set /p yn= "Are you ready to authorize GYB to backup/restore G Suite user mail? [y or n] "
+@set /p yn= "Are you a G Suite admin backing up user mail? [y or n] "
 @if /I "%yn%"=="n" (
 @  echo(
 @  echo You can authorize a service account later by running:

diff --git a/install-gyb.sh b/install-gyb.sh
@@ -90,8 +90,8 @@ case $myos in
     ;;
   [Mm]ac[Oo][sS]|[Dd]arwin)
     osver=$(sw_vers -productVersion | awk -F'.' '{print $2}')
-    if (( $osver < 10 )); then
-      echo_red "ERROR: GYB currently requires MacOS 10.10 or newer. You are running MacOS 10.$osver. Please upgrade." 
+    if (( $osver < 14 )); then
+      echo_red "ERROR: GYB currently requires MacOS 10.14 or newer. You are running MacOS 10.$osver. Please upgrade." 
       exit
     else
       echo_green "Good, you're running MacOS 10.$osver..."

diff --git a/linux-gyb.spec b/linux-gyb.spec
@@ -8,7 +8,6 @@ for d in a.datas:
         a.datas.remove(d)
         break
 a.datas += [('httplib2/cacerts.txt', 'httplib2/cacerts.txt', 'DATA')]
-a.datas += [('client_secrets.json', 'client_secrets.json', 'DATA')]
 pyz = PYZ(a.pure)
 exe = EXE(pyz,
           a.scripts,

diff --git a/macos-gyb.spec b/macos-gyb.spec
@@ -8,7 +8,6 @@ for d in a.datas:
         a.datas.remove(d)
         break
 a.datas += [('httplib2/cacerts.txt', 'httplib2/cacerts.txt', 'DATA')]
-a.datas += [('client_secrets.json', 'client_secrets.json', 'DATA')]
 pyz = PYZ(a.pure)
 exe = EXE(pyz,
           a.scripts,

diff --git a/windows-gyb.spec b/windows-gyb.spec
@@ -8,7 +8,6 @@ for d in a.datas:
         a.datas.remove(d)
         break
 a.datas += [('httplib2/cacerts.txt', 'httplib2\cacerts.txt', 'DATA')]
-a.datas += [('client_secrets.json', 'client_secrets.json', 'DATA')]
 pyz = PYZ(a.pure)
 exe = EXE(pyz,
           a.scripts,