diff --git a/README.md b/README.md index b9b56d64..663da186 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -GAM is a command line tool for Google G Suite Administrators to manage domain and user settings quickly and easily. [![Build Status](https://travis-ci.org/jay0lee/GAM.svg?branch=master)](https://travis-ci.org/jay0lee/GAM) +GAM is a command line tool for Google Workspace (fka G Suite) Administrators to manage domain and user settings quickly and easily. [![Build Status](https://travis-ci.org/jay0lee/GAM.svg?branch=master)](https://travis-ci.org/jay0lee/GAM) # Quick Start ## Linux / MacOS Open a terminal and run: diff --git a/src/gam-install.sh b/src/gam-install.sh index 613ce449..ff14c582 100755 --- a/src/gam-install.sh +++ b/src/gam-install.sh @@ -288,7 +288,7 @@ while true; do case $yn in [Yy]*) if [ "$adminuser" == "" ]; then - read -p "Please enter your G Suite admin email address: " adminuser + read -p "Please enter your Google Workspace admin email address: " adminuser fi "$target_dir/gam/gam" create project $adminuser rc=$? @@ -312,7 +312,7 @@ done admin_authorized=false while $project_created; do - read -p "Are you ready to authorize GAM to perform G Suite management operations as your admin account? (yes or no) " yn + read -p "Are you ready to authorize GAM to perform Google Workspace management operations as your admin account? (yes or no) " yn case $yn in [Yy]*) "$target_dir/gam/gam" oauth create $adminuser @@ -337,11 +337,11 @@ done service_account_authorized=false while $project_created; do - read -p "Are you ready to authorize GAM to manage G Suite user data and settings? (yes or no) " yn + read -p "Are you ready to authorize GAM to manage Google Workspace user data and settings? (yes or no) " yn case $yn in [Yy]*) if [ "$regularuser" == "" ]; then - read -p "Please enter the email address of a regular G Suite user: " regularuser + read -p "Please enter the email address of a regular Google Workspace user: " regularuser fi echo_yellow "Great! Checking service account scopes.This will fail the first time. Follow the steps to authorize and retry. It can take a few minutes for scopes to PASS after they've been authorized in the admin console." "$target_dir/gam/gam" user $adminuser check serviceaccount diff --git a/src/gam-setup.bat b/src/gam-setup.bat index 222c50d0..e71fc6c1 100644 --- a/src/gam-setup.bat +++ b/src/gam-setup.bat @@ -27,7 +27,7 @@ @ goto createproject ) @echo( -@set /p adminemail= "Please enter your G Suite admin email address: " +@set /p adminemail= "Please enter your Google Workspace admin email address: " @gam create project %adminemail% @if not ERRORLEVEL 1 goto projectdone @echo( @@ -37,7 +37,7 @@ :adminauth @echo( -@set /p yn= "Are you ready to authorize GAM to perform G Suite management operations as your admin account? [y or n] " +@set /p yn= "Are you ready to authorize GAM to perform Google Workspace management operations as your admin account? [y or n] " @if /I "%yn%"=="n" ( @ echo( @ echo You can authorize an admin later by running: @@ -59,7 +59,7 @@ :saauth @echo( -@set /p yn= "Are you ready to authorize GAM to manage G Suite user data and settings? [y or n] " +@set /p yn= "Are you ready to authorize GAM to manage Google Workspace user data and settings? [y or n] " @if /I "%yn%"=="n" ( @ echo( @ echo You can authorize a service account later by running: @@ -73,7 +73,7 @@ @ goto saauth ) @echo( -@set /p regularuser= "Please enter the email address of a regular G Suite user: " +@set /p regularuser= "Please enter the email address of a regular Google Workspace user: " @echo Great! Checking service account scopes. This will fail the first time. Follow the steps to authorize and retry. It can take a few minutes for scopes to PASS after they've been authorized in the admin console. @gam user %regularuser% check serviceaccount @if not ERRORLEVEL 1 goto sadone diff --git a/src/gam/__main__.py b/src/gam/__main__.py index 8bbe3156..59629fed 100644 --- a/src/gam/__main__.py +++ b/src/gam/__main__.py @@ -16,7 +16,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -"""GAM is a command line tool which allows Administrators to control their G Suite domain and accounts. +"""GAM is a command line tool which allows Administrators to control their Google Workspace domain and accounts. With GAM you can programmatically create users, turn on/off services for users like POP and Forwarding and much more. For more information, see https://git.io/gam diff --git a/src/gam/gapi/siteverification.py b/src/gam/gapi/siteverification.py index a5cc34fd..fd2c42e4 100644 --- a/src/gam/gapi/siteverification.py +++ b/src/gam/gapi/siteverification.py @@ -184,5 +184,5 @@ def update(): pass print() print( - f'You can now add {a_domain} or it\'s subdomains as secondary or domain aliases of the {GC_Values[GC_DOMAIN]} G Suite Account.' + f'You can now add {a_domain} or it\'s subdomains as secondary or domain aliases of the {GC_Values[GC_DOMAIN]} Google Workspace Account.' ) diff --git a/src/gam/var.py b/src/gam/var.py index f9f12c8e..f91affc9 100644 --- a/src/gam/var.py +++ b/src/gam/var.py @@ -117,7 +117,7 @@ SKUS = { '1010020020': { 'product': 'Google-Apps', 'aliases': ['gae', 'gse', 'enterprise', 'gsuiteenterprise'], - 'displayName': 'G Suite Enterprise' + 'displayName': 'Google Workspace Enterprise Plus (fka G Suite Enterprise)' }, '1010340002': { 'product': '101034', @@ -127,7 +127,7 @@ SKUS = { '1010340001': { 'product': '101034', 'aliases': ['gseau', 'enterprisearchived', 'gsuiteenterprisearchived'], - 'displayName': 'G Suite Enterprise Archived' + 'displayName': 'Google Workspace Enterprise Plus Archived' }, '1010060001': { 'product': '101006', @@ -135,7 +135,7 @@ SKUS = { 'gsuiteessentials', 'essentials', 'd4e', 'driveenterprise', 'drive4enterprise' ], - 'displayName': 'G Suite Essentials' + 'displayName': 'Google Workspace Essentials' }, 'Google-Drive-storage-20GB': { 'product': 'Google-Drive-storage', @@ -210,7 +210,7 @@ PRODUCTID_NAME_MAPPINGS = { '101031': 'G Suite Enterprise for Education', '101033': 'Google Voice', '101034': 'G Suite Archived', - 'Google-Apps': 'G Suite', + 'Google-Apps': 'Google Workspace', 'Google-Chrome-Device-Management': 'Google Chrome Device Management', 'Google-Coordinate': 'Google Coordinate', 'Google-Drive-storage': 'Google Drive Storage',