go.talks/present: fix static file path calculation and skip the "pkg" directory
also chmod -x two other files.
R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/6851071
diff --git a/present/appengine.go b/present/appengine.go
index 679e6d4..d37f11d 100644
--- a/present/appengine.go
+++ b/present/appengine.go
@@ -8,6 +8,8 @@
const socketPresent = false // no websockets or compilation on app engine (yet)
+var basePath = "./present/"
+
func HandleSocket(path string) {
panic("websockets not supported on app engine")
}
diff --git a/present/dir.go b/present/dir.go
index 42d50f5..61183b0 100644
--- a/present/dir.go
+++ b/present/dir.go
@@ -21,8 +21,6 @@
http.HandleFunc("/", dirHandler)
}
-var basePath = "./present/"
-
// dirHandler serves a directory listing for the requested path, rooted at basePath.
func dirHandler(w http.ResponseWriter, r *http.Request) {
if r.URL.Path == "/favicon.ico" {
@@ -126,6 +124,10 @@
}
d := &dirListData{Path: name}
for _, fi := range fis {
+ // skip the pkg directory
+ if name == "." && fi.Name() == "pkg" {
+ continue
+ }
e := dirEntry{
Name: fi.Name(),
Path: filepath.Join(name, fi.Name()),
diff --git a/present/main.go b/present/main.go
index acde8cc..c520f3a 100644
--- a/present/main.go
+++ b/present/main.go
@@ -20,6 +20,8 @@
const basePkg = "code.google.com/p/go.talks/present"
+var basePath string
+
func main() {
httpListen := flag.String("http", "127.0.0.1:3999", "host:port to listen on")
flag.StringVar(&basePath, "base", "", "base path for slide template and static resources")
diff --git a/present/static/styles.css b/present/static/styles.css
old mode 100755
new mode 100644
diff --git a/present/templates/slides.tmpl b/present/templates/slides.tmpl
old mode 100755
new mode 100644
