Fossil SCM
Omit the PATH= argument to SSH for "fossil patch push/pull" and "fossil ui" when the --fossilcmd option is used.
Commit
a35522f8a425c9689c68b7aa1b8df8b86a59fd3e1220c793437d681d5ad1e013
Parent
7ab1e1185031104…
2 files changed
+9
-4
+4
-2
+9
-4
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -3340,15 +3340,20 @@ | ||
| 3340 | 3340 | Blob ssh; |
| 3341 | 3341 | char zLine[1000]; |
| 3342 | 3342 | blob_init(&ssh, 0, 0); |
| 3343 | 3343 | transport_ssh_command(&ssh); |
| 3344 | 3344 | db_close_config(); |
| 3345 | - if( zFossilCmd==0 ) zFossilCmd = "fossil"; | |
| 3346 | 3345 | blob_appendf(&ssh, |
| 3347 | - " -t -L 127.0.0.1:%d:127.0.0.1:%d %!$" | |
| 3348 | - " %$ %$ ui --nobrowser --localauth --port %d", | |
| 3349 | - iPort, iPort, zRemote, "PATH=$HOME/bin:$PATH", zFossilCmd, iPort); | |
| 3346 | + " -t -L 127.0.0.1:%d:127.0.0.1:%d %!$", | |
| 3347 | + iPort, iPort, zRemote | |
| 3348 | + ); | |
| 3349 | + if( zFossilCmd==0 ){ | |
| 3350 | + blob_appendf(&ssh, " %$ fossil", "PATH=$HOME/bin:$PATH"); | |
| 3351 | + }else{ | |
| 3352 | + blob_appendf(&ssh, " %$", zFossilCmd); | |
| 3353 | + } | |
| 3354 | + blob_appendf(&ssh, " ui --nobrowser --localauth --port %d", iPort); | |
| 3350 | 3355 | if( zNotFound ) blob_appendf(&ssh, " --notfound %!$", zNotFound); |
| 3351 | 3356 | if( zFileGlob ) blob_appendf(&ssh, " --files-urlenc %T", zFileGlob); |
| 3352 | 3357 | if( g.zCkoutAlias ) blob_appendf(&ssh, " --ckout-alias %!$",g.zCkoutAlias); |
| 3353 | 3358 | if( g.zExtRoot ) blob_appendf(&ssh, " --extroot %$", g.zExtRoot); |
| 3354 | 3359 | if( skin_in_use() ) blob_appendf(&ssh, " --skin %s", skin_in_use()); |
| 3355 | 3360 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -3340,15 +3340,20 @@ | |
| 3340 | Blob ssh; |
| 3341 | char zLine[1000]; |
| 3342 | blob_init(&ssh, 0, 0); |
| 3343 | transport_ssh_command(&ssh); |
| 3344 | db_close_config(); |
| 3345 | if( zFossilCmd==0 ) zFossilCmd = "fossil"; |
| 3346 | blob_appendf(&ssh, |
| 3347 | " -t -L 127.0.0.1:%d:127.0.0.1:%d %!$" |
| 3348 | " %$ %$ ui --nobrowser --localauth --port %d", |
| 3349 | iPort, iPort, zRemote, "PATH=$HOME/bin:$PATH", zFossilCmd, iPort); |
| 3350 | if( zNotFound ) blob_appendf(&ssh, " --notfound %!$", zNotFound); |
| 3351 | if( zFileGlob ) blob_appendf(&ssh, " --files-urlenc %T", zFileGlob); |
| 3352 | if( g.zCkoutAlias ) blob_appendf(&ssh, " --ckout-alias %!$",g.zCkoutAlias); |
| 3353 | if( g.zExtRoot ) blob_appendf(&ssh, " --extroot %$", g.zExtRoot); |
| 3354 | if( skin_in_use() ) blob_appendf(&ssh, " --skin %s", skin_in_use()); |
| 3355 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -3340,15 +3340,20 @@ | |
| 3340 | Blob ssh; |
| 3341 | char zLine[1000]; |
| 3342 | blob_init(&ssh, 0, 0); |
| 3343 | transport_ssh_command(&ssh); |
| 3344 | db_close_config(); |
| 3345 | blob_appendf(&ssh, |
| 3346 | " -t -L 127.0.0.1:%d:127.0.0.1:%d %!$", |
| 3347 | iPort, iPort, zRemote |
| 3348 | ); |
| 3349 | if( zFossilCmd==0 ){ |
| 3350 | blob_appendf(&ssh, " %$ fossil", "PATH=$HOME/bin:$PATH"); |
| 3351 | }else{ |
| 3352 | blob_appendf(&ssh, " %$", zFossilCmd); |
| 3353 | } |
| 3354 | blob_appendf(&ssh, " ui --nobrowser --localauth --port %d", iPort); |
| 3355 | if( zNotFound ) blob_appendf(&ssh, " --notfound %!$", zNotFound); |
| 3356 | if( zFileGlob ) blob_appendf(&ssh, " --files-urlenc %T", zFileGlob); |
| 3357 | if( g.zCkoutAlias ) blob_appendf(&ssh, " --ckout-alias %!$",g.zCkoutAlias); |
| 3358 | if( g.zExtRoot ) blob_appendf(&ssh, " --extroot %$", g.zExtRoot); |
| 3359 | if( skin_in_use() ) blob_appendf(&ssh, " --skin %s", skin_in_use()); |
| 3360 |
+4
-2
| --- src/patch.c | ||
| +++ src/patch.c | ||
| @@ -692,13 +692,15 @@ | ||
| 692 | 692 | Blob remote; |
| 693 | 693 | *(char*)(zDir-1) = 0; |
| 694 | 694 | transport_ssh_command(&cmd); |
| 695 | 695 | blob_appendf(&cmd, " -T"); |
| 696 | 696 | blob_append_escaped_arg(&cmd, zRemote, 0); |
| 697 | - blob_append_escaped_arg(&cmd, "PATH=$HOME/bin:$PATH", 0); | |
| 698 | 697 | blob_init(&remote, 0, 0); |
| 699 | - if( zFossilCmd==0 ) zFossilCmd = "fossil"; | |
| 698 | + if( zFossilCmd==0 ){ | |
| 699 | + blob_append_escaped_arg(&cmd, "PATH=$HOME/bin:$PATH", 0); | |
| 700 | + zFossilCmd = "fossil"; | |
| 701 | + } | |
| 700 | 702 | blob_appendf(&remote, "%$ patch %s%s --dir64 %z -", |
| 701 | 703 | zFossilCmd, zRemoteCmd, zForce, encode64(zDir, -1)); |
| 702 | 704 | blob_append_escaped_arg(&cmd, blob_str(&remote), 0); |
| 703 | 705 | blob_reset(&remote); |
| 704 | 706 | } |
| 705 | 707 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -692,13 +692,15 @@ | |
| 692 | Blob remote; |
| 693 | *(char*)(zDir-1) = 0; |
| 694 | transport_ssh_command(&cmd); |
| 695 | blob_appendf(&cmd, " -T"); |
| 696 | blob_append_escaped_arg(&cmd, zRemote, 0); |
| 697 | blob_append_escaped_arg(&cmd, "PATH=$HOME/bin:$PATH", 0); |
| 698 | blob_init(&remote, 0, 0); |
| 699 | if( zFossilCmd==0 ) zFossilCmd = "fossil"; |
| 700 | blob_appendf(&remote, "%$ patch %s%s --dir64 %z -", |
| 701 | zFossilCmd, zRemoteCmd, zForce, encode64(zDir, -1)); |
| 702 | blob_append_escaped_arg(&cmd, blob_str(&remote), 0); |
| 703 | blob_reset(&remote); |
| 704 | } |
| 705 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -692,13 +692,15 @@ | |
| 692 | Blob remote; |
| 693 | *(char*)(zDir-1) = 0; |
| 694 | transport_ssh_command(&cmd); |
| 695 | blob_appendf(&cmd, " -T"); |
| 696 | blob_append_escaped_arg(&cmd, zRemote, 0); |
| 697 | blob_init(&remote, 0, 0); |
| 698 | if( zFossilCmd==0 ){ |
| 699 | blob_append_escaped_arg(&cmd, "PATH=$HOME/bin:$PATH", 0); |
| 700 | zFossilCmd = "fossil"; |
| 701 | } |
| 702 | blob_appendf(&remote, "%$ patch %s%s --dir64 %z -", |
| 703 | zFossilCmd, zRemoteCmd, zForce, encode64(zDir, -1)); |
| 704 | blob_append_escaped_arg(&cmd, blob_str(&remote), 0); |
| 705 | blob_reset(&remote); |
| 706 | } |
| 707 |