Command line now takes precedent over environment variable. Doc updated.

Xfennec · Jan 25, 2016 · fc8046c · fc8046c
1 parent b59ddfd
commit fc8046c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/progress.1 b/progress.1
@@ -83,6 +83,7 @@ display help message and exit
 
 .SH ENVIRONMENT
 It's possible to give permanent options using PROGRESS_ARGS environment variable.
+See example below. Command line arguments take precedence over environment.
 
 .SH EXAMPLES
 
@@ -109,6 +110,13 @@ Launch and monitor any heavy command using $!
 
 .B cp bigfile newfile & progress \-mp $!
 
+
+.RE
+Use environment variable to set permanent (multiple) arguments
+.RS
+
+.B export PROGRESS_ARGS='-M \-\-ignore-file ~/.xsession-errors'
+
 .RE
 .SH BUGS
 Please report bugs at: http://github.com/Xfennec/progress/issues

diff --git a/progress.c b/progress.c
@@ -817,7 +817,6 @@ char *env_progress_args_full;
 
 env_progress_args = getenv("PROGRESS_ARGS");
 
-parse_options(argc,argv);
 if (env_progress_args) {
     int full_len;
 
@@ -833,6 +832,7 @@ if (env_progress_args) {
     }
     parse_options(env_wordexp.we_wordc,env_wordexp.we_wordv);
 }
+parse_options(argc,argv);
 
 // ws.ws_row, ws.ws_col
 ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws);