diff --git a/TODO b/TODO index 43285be40..bf5710f09 100644 --- a/TODO +++ b/TODO @@ -1,10 +1,3 @@ --- ./dev-camtool shouldn't look at $HOME's config: - - $ ./dev-camtool sync - Building ./cmd/camtool ... - camlistore.org/cmd/camtool - 2013/06/09 10:57:22 Missing or invalid "server" in "/Users/bradfitz/.camlistore/config" - -- support for building (with just "make" or "go run make.go" for Windows) without having the camlistore-0.1.tar.gz extracted into a GOPATH (or really: not having any GOPATH set). should diff --git a/dev-camget b/dev-camget index 63f87cf11..e9bb5e0a9 100755 --- a/dev-camget +++ b/dev-camget @@ -29,7 +29,7 @@ $ENV{"CAMLI_CONFIG_DIR"} = "$Bin/config/dev-client-dir"; $ENV{"CAMLI_SECRET_RING"} = "$Bin/pkg/jsonsign/testdata/test-secring.gpg"; $ENV{"CAMLI_KEYID"} = "26F5ABDA"; $ENV{"CAMLI_DEV_KEYBLOBS"} = "$Bin/config/dev-client-dir/keyblobs"; -$ENV{CAMLI_AUTH} = "userpass:camlistore:pass3179"; +$ENV{"CAMLI_AUTH"} = "userpass:camlistore:pass3179"; my $blobserver = "http://localhost:3179/bs"; if ($opt_tls) { $blobserver =~ s/^http/https/; diff --git a/dev-camtool b/dev-camtool index dd08de1fe..cad17e426 100755 --- a/dev-camtool +++ b/dev-camtool @@ -6,6 +6,14 @@ use Getopt::Long; require "$Bin/misc/devlib.pl"; my $tool = build_bin("./cmd/camtool"); + +# Copy of dev-camget's settings. See comments there. +$ENV{"CAMLI_CONFIG_DIR"} = "$Bin/config/dev-client-dir"; +$ENV{"CAMLI_SECRET_RING"} = "$Bin/pkg/jsonsign/testdata/test-secring.gpg"; +$ENV{"CAMLI_KEYID"} = "26F5ABDA"; +$ENV{"CAMLI_DEV_KEYBLOBS"} = "$Bin/config/dev-client-dir/keyblobs"; +$ENV{"CAMLI_AUTH"} = "userpass:camlistore:pass3179"; + exec($tool, @ARGV); die "Failed to exec camtool.";