mirror of https://github.com/perkeep/perkeep.git
Make dev website start on Mac too. run-blobserver was using readlink -f, which isn't available on OS X.
Change-Id: I72fb1c687b31fb0f94fd112744d314e9034bf9d8
This commit is contained in:
parent
7a1a713d8d
commit
7bd17b7f8e
|
@ -0,0 +1,16 @@
|
||||||
|
5f053cc6143f2624ade4ff193b2ae0dfa2fc8b68
|
||||||
|
|
||||||
|
This file's random string on the first line is an optimization and
|
||||||
|
paranoia facility for clients.
|
||||||
|
|
||||||
|
If the client sees the same random string in multiple upload sessions,
|
||||||
|
it assumes that the blobserver still has all the same blobs, and also
|
||||||
|
it's the same server. This mechanism is not fundamental to
|
||||||
|
Camlistore's operation: the client could also check each blob before
|
||||||
|
uploading, or enumerate all blobs from the server too. This is purely
|
||||||
|
an optimization so clients can mix this value into their "is this file
|
||||||
|
uploaded?" local cache keys.
|
||||||
|
|
||||||
|
If you deleted any blobs (or suspect any were corrupted), it's best to
|
||||||
|
delete this file so clients can safely re-upload them.
|
||||||
|
|
|
@ -282,6 +282,8 @@ func runAsChild(res string) {
|
||||||
log.Fatalf("Could not find %v in $PATH: %v", res, err)
|
log.Fatalf("Could not find %v in $PATH: %v", res, err)
|
||||||
}
|
}
|
||||||
cmd := exec.Command(cmdName)
|
cmd := exec.Command(cmdName)
|
||||||
|
cmd.Stderr = os.Stderr
|
||||||
|
cmd.Stdout = os.Stdout
|
||||||
log.Printf("Running %v", res)
|
log.Printf("Running %v", res)
|
||||||
if err := cmd.Start(); err != nil {
|
if err := cmd.Start(); err != nil {
|
||||||
log.Fatal("Program %v failed to start: %v", res, err)
|
log.Fatal("Program %v failed to start: %v", res, err)
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
Bin=$(dirname $( readlink -f $0))
|
Bin=$(perl -MFindBin -e 'print $FindBin::Bin')
|
||||||
|
|
||||||
export CAMLI_PASSWORD=`cat $HOME/.config/camlistore/camorg-blobserver.pass`
|
export CAMLI_PASSWORD=`cat $HOME/.config/camlistore/camorg-blobserver.pass`
|
||||||
export CAMLI_ROOT=$Bin/../blobserver-example/root
|
export CAMLI_ROOT=$Bin/blobserver-example/root
|
||||||
|
|
||||||
cd $Bin/../..
|
cd $Bin/..
|
||||||
go run make.go \
|
go run make.go \
|
||||||
-embed_static=false \
|
-embed_static=false \
|
||||||
-targets=camlistore.org/server/camlistored && \
|
-targets=camlistore.org/server/camlistored && \
|
||||||
./bin/camlistored \
|
./bin/camlistored \
|
||||||
-configfile=$Bin/../blobserver-example/example-blobserver-config.json \
|
-configfile=$Bin/blobserver-example/example-blobserver-config.json \
|
||||||
-listen=:3179 "$@"
|
-listen=:3179 "$@"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue