Skip to content
This repository was archived by the owner on Nov 17, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Options:
--version Show the version information.
--username Mergin username (or MERGIN_USERNAME env. variable)
--password Mergin password (or MERGIN_PASSWORD env. variable)
--url Mergin url (defaults to public.cloudmergin.com)
--url Mergin url (defaults to app.merginmaps.com)

Commands:
create Create a new project on Mergin server
Expand Down
6 changes: 3 additions & 3 deletions src/clientmain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ QString appDescription()
"----\n"\
" - use URL, username, password from command line args - e.g. --url https://dev.mergin.io/ --user martin --password XYZ\n"\
" - for any bits (URL / username / password) not specified as command line args, you may use env variables: MERGIN_URL, MERGIN_USER, MERGIN_PASSWORD\n"\
" - if URL is omitted, we would use public.cloudmergin.com\n"\
" - if URL is omitted, we would use app.merginmaps.com\n"\
"\n"\
"Commands\n"\
"--------\n"\
Expand Down Expand Up @@ -87,7 +87,7 @@ Args parseArgs()
parser.addOption( verboseOption );
QCommandLineOption jsonOption( "json", "Output 'info' command output in JSON format" );
parser.addOption( jsonOption );
QCommandLineOption urlOption( "url", "or use env. var MERGIN_URL. defaults to https://public.cloudmergin.com/", "url" );
QCommandLineOption urlOption( "url", "or use env. var MERGIN_URL. defaults to https://app.merginmaps.com/", "url" );
parser.addOption( urlOption );
QCommandLineOption userOption( "user", "or use env. var MERGIN_USER", "user" );
parser.addOption( userOption );
Expand All @@ -106,7 +106,7 @@ Args parseArgs()
if ( parser.isSet( versionOption ) )
parser.showVersion(); // exits the app

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