clean up bin & configs

Author: terraswat

README.md

@@ -1 +1,12 @@
-# hexagram
+# UCSC hexmap-viewer
+
+### Retrieve from the code repository.
+```
+git clone https://github.com/stuartlab-UCSC/hexmap-view
+```
+### Install a development environment
+View the developer documentation by pointing your web browser to
+```
+file://HEXMAP/docs/dev/index.html
+```
+where HEXMAP is the full path to the above install.

bin/README.txt

@@ -3,14 +3,8 @@ Scripts in this directory:
 
 Server operations:
     cd $HEXMAP
-    bin/start [ https / db / www ]
-    bin/stop [ https / db / www ]
-
-Or server operations for protected ports:
-    start db
-    stop db
-    sudo --preserve-env $HEXMAP/bin/start [ https / www ]
-    sudo --preserve-env $HEXMAP/bin/stop [ https / www ]
+    bin/start [ db / www ]
+    bin/stop [ db / www ]
 
 Installation:
     deployWww: make a tar file to install or update another installation

bin/checkProc.sh

@@ -8,28 +8,28 @@ fi
 
 source $HEX_VIEWER_CONFIG
 
-if [ -z $DEPLOY_TARGET_ARCH ]; then
-    echo "Exited, the env var, DEPLOY_TARGET_ARCH, must be defined"
+if [ -z $TARGET_ARCH ]; then
+    echo "Exited, the env var, TARGET_ARCH, must be defined"
     echo "Do you want to run installWww instead?"
     exit 1
 fi
-if [ -z $DEPLOY_TARGET_PATH ]; then
-    echo "Exited, the env var, DEPLOY_TARGET_PATH, must be defined"
+if [ -z $TARGET_PATH ]; then
+    echo "Exited, the env var, TARGET_PATH, must be defined"
     echo "Do you want to run installWww instead?"
     exit 1
 fi
-if [ "$BUNDLE" == true ]; then
+if [ "$DEV" == false ]; then
     echo "sorry, cannot deploy from a bundled build"
     exit 1
 fi
 
 # Build a www server with compression and other production enhancements.
 FILE=$HEXMAP/deploy/www.tar.gz
 cd $HEXMAP/www
-$METEOR_PATH npm install --production
-$METEOR_PATH build $HEXMAP/deploy --architecture $DEPLOY_TARGET_ARCH
+meteor npm install --production
+meteor build $HEXMAP/deploy --architecture $TARGET_ARCH
 cd $HEXMAP
 
-scp $FILE $DEPLOY_TARGET_PATH
+scp $FILE $TARGET_PATH
 echo if the scp timed out, do:
-echo "scp $FILE $DEPLOY_TARGET_PATH"
+echo "scp $FILE $TARGET_PATH"

bin/deployWww

@@ -12,7 +12,7 @@ if [ -z $INSTALL_TAR_PATH ]; then
     echo "Do you want to run deployWww instead?"
     exit 1
 fi
-if [ "$BUNDLED" == false ]; then
+if [ "$DEV" == true ]; then
     echo "sorry, cannot install a bundle into your unbundled environment"
     exit 1
 fi

bin/https.sh

@@ -13,15 +13,15 @@ fi
 echo starting the www server
 cd $HEXMAP/www
 export MAIL_URL="smtp://localhost:25"
-if [ "$BACK_OR_FOREGROUND" == "FORE" ]; then
+if [ "$DEV" == true ]; then
     if [ "$BUNDLE_VIZ" == true ]; then
         $METEOR_PATH run --port $PORT --settings $HEXMAP/config/settings.json \
             --extra-packages bundle-visualizer \
             --production
     else
         $METEOR_PATH run --port $PORT --settings $HEXMAP/config/settings.json
     fi
-elif [ "$BUNDLED" == true ]; then
+else
     # Packaged Meteor apps use METEOR_SETTINGS environment variable.
     export METEOR_SETTINGS=$(cat $HEXMAP/config/settings.json)
 
@@ -34,8 +34,5 @@ elif [ "$BUNDLED" == true ]; then
     # or equivalent.
     (nohup $NODE_BIN/node $HEXMAP/www/main.js &> $HEXMAP/log/www \
       & echo $! > $HEXMAP/pid/www)
-else
-    (nohup $METEOR_PATH run --port $PORT --settings $HEXMAP/config/settings.json \
-       &> $HEXMAP/log/www & echo $! > $HEXMAP/pid/www)
 fi