Skip to content

Commit e650c21

Browse files
authored
Trigger rebuild with Input sync fix for windows
Update comments about new url for Mergin Maps
2 parents 5a521a4 + 1b6a4b3 commit e650c21

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Options:
2525
--version Show the version information.
2626
--username Mergin username (or MERGIN_USERNAME env. variable)
2727
--password Mergin password (or MERGIN_PASSWORD env. variable)
28-
--url Mergin url (defaults to public.cloudmergin.com)
28+
--url Mergin url (defaults to app.merginmaps.com)
2929
3030
Commands:
3131
create Create a new project on Mergin server

src/clientmain.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ QString appDescription()
5757
"----\n"\
5858
" - use URL, username, password from command line args - e.g. --url https://dev.mergin.io/ --user martin --password XYZ\n"\
5959
" - for any bits (URL / username / password) not specified as command line args, you may use env variables: MERGIN_URL, MERGIN_USER, MERGIN_PASSWORD\n"\
60-
" - if URL is omitted, we would use public.cloudmergin.com\n"\
60+
" - if URL is omitted, we would use app.merginmaps.com\n"\
6161
"\n"\
6262
"Commands\n"\
6363
"--------\n"\
@@ -87,7 +87,7 @@ Args parseArgs()
8787
parser.addOption( verboseOption );
8888
QCommandLineOption jsonOption( "json", "Output 'info' command output in JSON format" );
8989
parser.addOption( jsonOption );
90-
QCommandLineOption urlOption( "url", "or use env. var MERGIN_URL. defaults to https://public.cloudmergin.com/", "url" );
90+
QCommandLineOption urlOption( "url", "or use env. var MERGIN_URL. defaults to https://app.merginmaps.com/", "url" );
9191
parser.addOption( urlOption );
9292
QCommandLineOption userOption( "user", "or use env. var MERGIN_USER", "user" );
9393
parser.addOption( userOption );
@@ -106,7 +106,7 @@ Args parseArgs()
106106
if ( parser.isSet( versionOption ) )
107107
parser.showVersion(); // exits the app
108108

109-
args.url = parseEnvArg( parser.value( urlOption ), "MERGIN_URL", false ); // MerginApi has public.cloudmergin.com as default
109+
args.url = parseEnvArg( parser.value( urlOption ), "MERGIN_URL", false ); // MerginApi has app.merginmaps.com as default
110110
args.user = parseEnvArg( parser.value( userOption ), "MERGIN_USER" );
111111
args.pass = parseEnvArg( parser.value( passwordOption ), "MERGIN_PASSWORD" );
112112
args.isVerbose = parser.isSet( verboseOption );

0 commit comments

Comments
 (0)