3 files changed, 20 insertions(+), 20 deletions(-)

M README.md
M menu.go
M mkfile

@@ 1,6 1,6 @@
-# disco: [Discord](https://discord.gg) client for 9Front
+# disco: [Discord](https://discord.gg) client for 9front
 
-Hacked up version of theboxmage's [discord-cli](https://github.com/theboxmage/discordcli)
+Fork of theboxmage's [discord-cli](https://github.com/theboxmage/discordcli)
 
 JSON config is in `$home/lib/disco.cfg` for setting password, should be made automatically after first run.
 


@@ 15,8 15,6 @@ go get bitbucket.org/henesy/disco
 
 ## Problems
 
-* You might have to run `mk` or `mk install` twice
-
 * JSON
 
 * PM's are temporarily disabled


@@ 40,3 38,17 @@ Commands available in chat:
 
 If you can connect to a channel and see messages, but yours aren't sending, check to make sure your e-mail address is verified.
 
+## FAQ
+
+Q: What if `go get` doesn't work?
+
+A: If you want to use `go get` on 9front to install disco and its dependencies (recommended) you should use [driusan's dgit](https://github.com/driusan/dgit) as `git`.
+
+Q: What if I can't login because of a captcha error?
+
+A: You'll need to sign in to Discord via the web app (thus solving a captcha) using a browser with html5/js. I recommend an http proxy such as [this](https://bitbucket.org/henesy/http-proxy).
+
+Q: What if I get an error about signing in from a new location?
+
+A: Discord has sent you an e-mail with a location confirmation link, click it, no js should be required.
+

@@ 244,6 244,7 @@ Start:
 		reader := bufio.NewReader(os.Stdin)
 		response, _ := reader.ReadString('\n')
 		response = response[:len(response)-1]
+		fmt.Println(response, " ", len(response))
 		
 		//fmt.Scanf("%s\n", &response)
 		if response == "y" {

@@ 7,25 7,12 @@ all:
 install: all
 	cp ./disco $home/bin/$GOARCH/disco
 
-deps: 
-	mkdir -p $GOPATH/src/bitbucket.org/henesy/disco
-	dircp ./ $GOPATH/src/bitbucket.org/henesy/disco
-
-crypto:
-	orig=`{pwd}
-	mkdir -p $GOPATH/src/golang.org/x/crypto
-	cd $GOPATH/src/golang.org/x
-	hget https://github.com/golang/crypto/archive/master.zip > crypto.zip; unzip -f crypto.zip
-	dircp crypto-master crypto; rm -r crypto-master
-	cd $orig
-
-rebuild: 
-	go install bitbucket.org/henesy/disco
-	mk install
-
 bins: 
 	arch=(amd64 386 arm)
+	mkdir bin
 	for(a in $arch){
+		mkdir bin/$a
 		GOARCH=$a go build
 		cp disco bin/^$a^/
+		rm disco
 	}