Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix environment of dev-camtool. 

Change-Id: I671e18cbc07ed9f28afdd3ac7368cd691f44a992
This commit is contained in:
Brad Fitzpatrick 2013-06-09 11:03:48 +02:00
parent 248a30ee9f
commit ebbc943502
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
TODO
View File

@ -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

2
dev-camget
View File

@ -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/;

8
dev-camtool
View File

@ -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.";