mirror of https://github.com/perkeep/perkeep.git
update dev-camput to not use build.pl
Change-Id: I44caef27675511addb54027e9dc3c6f3ca84f138
This commit is contained in:
parent
3b835e76ea
commit
ba1e1d5c6a
11
dev-camput
11
dev-camput
|
@ -4,7 +4,11 @@ use strict;
|
||||||
use FindBin qw($Bin);
|
use FindBin qw($Bin);
|
||||||
use Getopt::Long;
|
use Getopt::Long;
|
||||||
|
|
||||||
system("$Bin/build.pl", "camput") and die "failed to build camput";
|
unless ($ENV{GOPATH}) {
|
||||||
|
$ENV{GOPATH} = "$Bin/gopath"
|
||||||
|
}
|
||||||
|
|
||||||
|
system("go", "install", "camlistore.org/cmd/camput") and die "failed to build camput";
|
||||||
|
|
||||||
sub usage {
|
sub usage {
|
||||||
die "Usage: dev-camput [--tls] -- camput_args";
|
die "Usage: dev-camput [--tls] -- camput_args";
|
||||||
|
@ -22,13 +26,14 @@ $ENV{"CAMLI_CONFIG_DIR"} = "$Bin/config/dev-client-dir";
|
||||||
$ENV{"CAMLI_SECRET_RING"} = "$Bin/lib/go/camli/jsonsign/testdata/test-secring.gpg";
|
$ENV{"CAMLI_SECRET_RING"} = "$Bin/lib/go/camli/jsonsign/testdata/test-secring.gpg";
|
||||||
$ENV{"CAMLI_KEYID"} = "26F5ABDA";
|
$ENV{"CAMLI_KEYID"} = "26F5ABDA";
|
||||||
$ENV{"CAMLI_DEV_KEYBLOBS"} = "$Bin/config/dev-client-dir/keyblobs";
|
$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";
|
my $blobserver = "http://localhost:3179/bs";
|
||||||
if ($opt_tls) {
|
if ($opt_tls) {
|
||||||
$blobserver =~ s/^http/https/;
|
$blobserver =~ s/^http/https/;
|
||||||
}
|
}
|
||||||
|
|
||||||
exec("$Bin/clients/go/camput/camput",
|
exec("$ENV{GOPATH}/bin/camput",
|
||||||
"--verbose",
|
"--verbose",
|
||||||
"--blobserver=$blobserver",
|
"--blobserver=$blobserver",
|
||||||
@ARGV);
|
@ARGV);
|
||||||
|
die "Failure running camput: $!";
|
||||||
|
|
Loading…
Reference in New Issue