Merge pull request #978 from lynnaloo/master

Removed trailing spaces

diff --git a/README.md b/README.md
index 4c6399e..8c4c107 100644 (file)
--- a/README.md
+++ b/README.md
@@ -37,4 +37,4 @@ View the [Release Notes](RELEASE.md) to see a change log.
   * [Architectural Overview](https://github.com/xtuple/xtuple/wiki/Overview)
   * [Building an Extension Tutorial](https://github.com/xtuple/xtuple-extensions/blob/master/docs/TUTORIAL.md)
   * [API documentation](http://xtuple.com/jsdoc)
-  * [Developer Wiki](https://github.com/xtuple/xtuple/wiki) 
+  * [Developer Wiki](https://github.com/xtuple/xtuple/wiki)

diff --git a/scripts/install_xtuple.sh b/scripts/install_xtuple.sh
index 1d6c743..434d69c 100755 (executable)
--- a/scripts/install_xtuple.sh
+++ b/scripts/install_xtuple.sh
@@ -164,7 +164,7 @@ clone_repo() {
        then
                return 1
        fi
-       
+
        cdir $BASEDIR
        if [ ! -d plv8js ]
        then
@@ -180,7 +180,7 @@ clone_repo() {
        else
                log "Found /usr/src/v8"
        fi
-       
+
        cdir $XT_DIR
        # add remote
        if [ -z "$(git remote -v | grep xtuple/xtuple.git)" ]
@@ -188,7 +188,7 @@ clone_repo() {
                log "Adding xtuple remote"
                su $SUDO_USER -c "git remote add --track master xtuple https://github.com/xtuple/xtuple.git"
        fi
-       
+
        if [ $XT_VERSION ]
        then
                log "Checking out $XT_VERSION"
@@ -204,9 +204,9 @@ build_deps() {
        # 3. if not, see if we can download the pre-made deb package
        # 4. if not, compile from source
        # the source should be cloned whether we need to compile or not
-       
+
        cdir $RUN_DIR
-       
+
        log "Checking if nodejs is installed"
        dpkg -s nodejs 2>1 > /dev/null
        if [ $? -eq 0 ]
@@ -214,7 +214,7 @@ build_deps() {
                log "nodejs is installed."
        else
                log "nodejs is not installed"
-               
+
                log "Looking for nodejs_$NODE_VERSION.deb in $(pwd)"
                if [ ! -f nodejs_$NODE_VERSION.deb ]
                then
@@ -246,7 +246,7 @@ build_deps() {
                        dpkg -i nodejs_$NODE_VERSION.deb 2>1 | tee -a $LOG_FILE
                fi
        fi
-       
+
        cdir $RUN_DIR
        log "Checking if libv8 is installed"
        dpkg -s libv8 2>1 > /dev/null
@@ -255,7 +255,7 @@ build_deps() {
                log "libv8 is installed"
        else
                log "libv8 is not installed."
-               
+
                log "Looking for libv8-3.16.5_3.16.5-1_amd64.deb in $(pwd)"
                if [ -f libv8-3.16.5_3.16.5-1_amd64.deb ]
                then
@@ -264,7 +264,7 @@ build_deps() {
                else
                        log "File not found."
                        log "Attempting to download $XTUPLE_REPO/libv8-3.16.5_3.16.5-1_amd64.deb"
-                       
+
                        wget -q $XTUPLE_REPO/libv8-3.16.5_3.16.5-1_amd64.deb && wait
                        if [ $? -ne 0 ]
                        then
@@ -285,7 +285,7 @@ build_deps() {
                        fi
                fi
        fi
-       
+
        cdir $RUN_DIR
        log "Checking if plv8js is installed."
        dpkg -s postgresql-9.1-plv8 2>1 > /dev/null
@@ -294,7 +294,7 @@ build_deps() {
                log "plv8js is installed"
        else
                log "plv8js is not installed"
-               
+
                log "Looking for postgresql-9.1-plv8_1.4.0-1_amd64.deb in $(pwd)"
                if [ ! -f postgresql-9.1-plv8_1.4.0-1_amd64.deb ]
                then
@@ -333,7 +333,7 @@ setup_postgres() {
        then
                return 1
        fi
-       
+
        PGDIR=/etc/postgresql/9.1/main
        mv $PGDIR/postgresql.conf $PGDIR/postgresql.conf.default
        if [ $? -ne 0 ]
@@ -347,12 +347,12 @@ setup_postgres() {
        chown postgres $PGDIR/pg_hba.conf
 
        service postgresql restart
-       
+
        log ""
        log "Dropping old databases if they already exist..."
        log ""
        dropdb -U postgres dev
-       
+
        cdir $BASEDIR/postgres
        wget http://sourceforge.net/api/file/index/project-id/196195/mtime/desc/limit/200/rss
        wait
@@ -399,7 +399,7 @@ setup_postgres() {
 
 # Pull submodules
 
-pull_modules() { 
+pull_modules() {
        cdir $XT_DIR
        git submodule update --init --recursive 2>1 | tee -a $LOG_FILE
        if [ $? -ne 0 ]
@@ -440,7 +440,7 @@ init_everythings() {
        log ""
 
        psql -U postgres dev -c "select xt.js_init(); insert into xt.usrext (usrext_usr_username, usrext_ext_id) select 'admin', ext_id from xt.ext where ext_location = '/core-extensions';" 2>1 | tee -a $LOG_FILE
-  
+
        cdir $XT_DIR/node-datasource
 
        cat sample_config.js | sed 's/bindAddress: "localhost",/bindAddress: "0.0.0.0",/' | sed 's/testDatabase: ""/testDatabase: "dev"/' > config.js
@@ -449,7 +449,7 @@ init_everythings() {
        log ""
        log "The database is now set up..."
        log ""
-       
+
        mkdir -p $XT_DIR/node-datasource/lib/private
        cdir $XT_DIR/node-datasource/lib/private
        cat /dev/urandom | tr -dc '0-9a-zA-Z!@#$%^&*_+-'| head -c 64 > salt.txt
@@ -469,7 +469,7 @@ init_everythings() {
 
        cdir $XT_DIR
        node scripts/build_app.js -d dev 2>1 | tee -a $LOG_FILE
-       
+
        log ""
        log "######################################################"
        log "######################################################"

diff --git a/scripts/jsdoc_README.md b/scripts/jsdoc_README.md
index 29b4ad7..175bd55 100644 (file)
--- a/scripts/jsdoc_README.md
+++ b/scripts/jsdoc_README.md
@@ -3,7 +3,7 @@ the client of the xTuple Web/Mobile platform. It does not
 include database or datasource code, nor does it include
 business-object-specific implementation classes.
 
-These objects are in one of three namespaces: 
+These objects are in one of three namespaces:
 
 * `XV`: views, typically defined in `lib/enyo-x`
 * `XM`: models, typically defined in `lib/backbone-x`