Merge branch 'master' of ssh://cogarr.net:43/home/git/sober into swat

3 files changed, 22 insertions, 33 deletions

diff --git a/build.sh b/build.sh
index 6e543de..19dabaf 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-DEPLOYDIR="deploy"
-PROJECTNAME="My SOBER Instance"
+DEPLOYDIR="/var/www/webpage/bugs/artery"
+PROJECTNAME="Artery bug tracker"
+ADMINEMAIL="alexandermpickering@gmail.com"
 
 ##Check to see if imgmagik is installed
 convert -version > /dev/null
@@ -45,23 +46,29 @@ cp src/*.css "$DEPLOYDIR/"
 cp -R src/css "$DEPLOYDIR/"
 
 #Since the POSIX shell dosen't specify arrays, you can't simplyfy this to an array, and loop over it
-sed -e  "s/SOBER_DEPLOY_DIR/\"$DEPLOYDIR\"/g" \
-    -e  "s/SOBER_PROJECT_NAME/\"$PROJECTNAME\"/g" < src/index.js > "$DEPLOYDIR/index.js"
+sed -e  "s~SOBER_DEPLOY_DIR~$DEPLOYDIR~g" \
+    -e  "s~SOBER_ADMIN_CONTACT~$ADMINEMAIL~g" \
+    -e  "s~SOBER_PROJECT_NAME~$PROJECTNAME~g" < src/index.js > "$DEPLOYDIR/index.js"
 
-sed -e  "s/SOBER_DEPLOY_DIR/\"$DEPLOYDIR\"/g" \
-    -e  "s/SOBER_PROJECT_NAME/\"$PROJECTNAME\"/g" < src/index.html > "$DEPLOYDIR/index.html"
+sed -e  "s~SOBER_DEPLOY_DIR~$DEPLOYDIR~g" \
+    -e  "s~SOBER_ADMIN_CONTACT~$ADMINEMAIL~g" \
+    -e  "s~SOBER_PROJECT_NAME~$PROJECTNAME~g" < src/index.html > "$DEPLOYDIR/index.html"
 
-sed -e  "s/SOBER_DEPLOY_DIR/\"$DEPLOYDIR\"/g" \
-    -e  "s/SOBER_PROJECT_NAME/\"$PROJECTNAME\"/g" < src/bugview.html > "$DEPLOYDIR/bugview.html"
+sed -e  "s~SOBER_DEPLOY_DIR~$DEPLOYDIR~g" \
+    -e  "s~SOBER_ADMIN_CONTACT~$ADMINEMAIL~g" \
+    -e  "s~SOBER_PROJECT_NAME~$PROJECTNAME~g" < src/bugview.html > "$DEPLOYDIR/bugview.html"
 
-sed -e  "s/SOBER_DEPLOY_DIR/\"$DEPLOYDIR\"/g" \
-    -e  "s/SOBER_PROJECT_NAME/\"$PROJECTNAME\"/g" < src/bugview.js > "$DEPLOYDIR/bugview.js"
+sed -e  "s~SOBER_DEPLOY_DIR~$DEPLOYDIR~g" \
+    -e  "s~SOBER_ADMIN_CONTACT~$ADMINEMAIL~g" \
+    -e  "s~SOBER_PROJECT_NAME~$PROJECTNAME~g" < src/bugview.js > "$DEPLOYDIR/bugview.js"
 
-sed -e  "s/SOBER_DEPLOY_DIR/\"$DEPLOYDIR\"/g" \
-    -e  "s/SOBER_PROJECT_NAME/\"$PROJECTNAME\"/g" < src/searchbugs.html > "$DEPLOYDIR/searchbugs.js"
+sed -e  "s~SOBER_DEPLOY_DIR~$DEPLOYDIR~g" \
+    -e  "s~SOBER_ADMIN_CONTACT~$ADMINEMAIL~g" \
+    -e  "s~SOBER_PROJECT_NAME~$PROJECTNAME~g" < src/searchbugs.html > "$DEPLOYDIR/searchbugs.js"
 
-sed -e  "s/SOBER_DEPLOY_DIR/\"$DEPLOYDIR\"/g" \
-    -e  "s/SOBER_PROJECT_NAME/\"$PROJECTNAME\"/g" < src/searchbugs.js > "$DEPLOYDIR/searchbugs.js"
+sed -e  "s~SOBER_DEPLOY_DIR~$DEPLOYDIR~g" \
+    -e  "s~SOBER_ADMIN_CONTACT~$ADMINEMAIL~g" \
+    -e  "s~SOBER_PROJECT_NAME~$PROJECTNAME~g" < src/searchbugs.js > "$DEPLOYDIR/searchbugs.js"
 
 echo 0 > "$DEPLOYDIR/bugs/lastbug"
 touch "$DEPLOYDIR/bugs/recent"
diff --git a/src/gencaptcha.c b/src/gencaptcha.c
index 7a97059..6085321 100644
--- a/src/gencaptcha.c
+++ b/src/gencaptcha.c
@@ -67,7 +67,7 @@ int main(){
   system(command);
   sprintf(command,"convert \"%s/captchas/%lu.png\" -distort Barrel \"0.0%d 0.0 0.0%d\" \"%s/captchas/%lu.png\"",REL_BINPATH,rhash,barraldis1,barraldis2,REL_BINPATH,rhash);
   system(command);
-  sprintf(command,"convert \"\"%s/captchas/%lu.png\" -virtual-pixel White -distort Arc %d \"%s/captchas/%lu.png\"",REL_BINPATH,rhash,arcdis,REL_BINPATH,rhash);
+  sprintf(command,"convert \"%s/captchas/%lu.png\" -virtual-pixel White -distort Arc %d \"%s/captchas/%lu.png\"",REL_BINPATH,rhash,arcdis,REL_BINPATH,rhash);
   system(command);
 
   printf("%s%c%c\n","Content-Type:text/html;charset=iso-8859-1",13,10);
diff --git a/src/searchbugs.c b/src/searchbugs.c
index da15c99..ebd6de9 100644
--- a/src/searchbugs.c
+++ b/src/searchbugs.c
@@ -49,21 +49,3 @@ int main(){
     thisbugnum--;
   }
 }
-
-void printbug(FILE* f){
-
-  int line = 0;
-  char tchar = ' ';
-  while((tchar = fgetc(f)) && tchar != EOF){
-    if(tchar == '\n')
-      line++;
-    if(line > 4)
-      break;
-    putchar(tchar);
-  }
-
-  unsigned int comments = 0;
-  while (EOF != (fscanf(f,"%*[^\n]"), fscanf(f,"%*c")))
-    ++comments;
-  printf("\n%u\n",(comments-1)/4);
-}