Merge branch 'master' of https://github.com/nosqlbench/nosqlbench

nb/build-bin.sh

@@ -1,6 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 set -x
-mkdir -p target/NB.AppDir
+
+APPDIR=target/NB.AppDir
+mkdir -p ${APPDIR}
 
 if [ ! -f target/nb.jar ]
 then
@@ -14,8 +17,8 @@ fi
 # rm target/nb
 #fi
 
-rsync -av appimage/skel/ target/NB.AppDir/
-cp target/nb.jar target/NB.AppDir/usr/bin/nb.jar
+rsync -av appimage/skel/ "${APPDIR}/"
+cp target/nb.jar "${APPDIR}/usr/bin/nb.jar"
 
 if [ ! -d "cache/jre" ]
 then
@@ -29,18 +32,18 @@ then
   ))
 fi
 
-mkdir -p target/NB.AppDir/usr/bin/jre
-rsync -av cache/jre/ target/NB.AppDir/usr/bin/jre/
+mkdir -p "${APPDIR}/usr/bin/jre"
+rsync -av cache/jre/ "${APPDIR}/usr/bin/jre/"
 
-if [ ! -f "target/NB.AppDir/AppRun" ]
+if [ ! -f "${APPDIR}/AppRun" ]
   then
-  ( cd target/NB.AppDir && (
+  ( cd ${APPDIR} && (
    printf "Linking AppRun...\n";
    ln -s usr/bin/nb AppRun
   ))
 fi
 
-#( cd target/NB.AppDir && (
+#( cd ${APPDIR} && (
 #  rsync -av ..
 #  if [ ! -d "usr/bin/jre" ]
 #  then

nb/gendocs.sh

@@ -12,20 +12,20 @@ fi
 if [ ! -d "target/guidebook" ]
 then
 
- pushd ../docsys/src/main/node/docsys
- if ! ./update.sh $@
+ pushd ../docsys/src/main/node/docsys || exit 1
+ if ! ./update.sh "$@"
  then
    printf "Unable to update the guidebook static app\n"
    exit 2;
  fi
  popd
  
- cp -R ../docsys/src/main/resources/docsys-guidebook/ target/guidebook/
+ cp -R ../docsys/src/main/resources/docsys-guidebook/ ${GUIDEBOOK}/
 else
- printf "target/guidebook exists, not building again until mvn clean\n"
+ printf "${GUIDEBOOK} exists, not building again until mvn clean\n"
 fi
 
-JAVA=$(which java)
+JAVA=$(command -v java)
 JAVA=${JAVA:-$JAVA_HOME/bin/java}
 
 if [ ! -x "$JAVA" ]
@@ -34,9 +34,9 @@ then
  exit 5
 fi
 
-$JAVA -jar target/nb.jar docserver generate target/guidebook
+$JAVA -jar target/nb.jar docserver generate ${GUIDEBOOK}/
 
 #JAVA_HOME=${JAVA_HOME:-JAVA_HOME must be specified if java isn not in the path}
 #
 ## static site for gh pages
-#java -jar nb/target/nb.jar docserver generate target/guidebook
+#java -jar nb/target/nb.jar docserver generate ${GUIDEBOOK}/

nb/pom.xml

@@ -180,15 +180,6 @@
                  <groupId>org.codehaus.mojo</groupId>
                  <artifactId>exec-maven-plugin</artifactId>
                  <executions>
-                     <execution>
-                         <id>build-nb-appimage</id>
-                         <phase>package</phase>
-                         <goals><goal>exec</goal></goals>
-                         <configuration>
-                             <basedir>${project.basedir}</basedir>
-                             <executable>${project.basedir}/build-bin.sh</executable>
-                         </configuration>
-                     </execution>
                      <execution>
                          <id>build-static-guidebook</id>
                          <phase>package</phase>
@@ -205,8 +196,35 @@
     </build>
 
     <profiles>
-
-        <profile>
+      <profile>
+        <activation>
+          <os>
+            <family>unix</family>
+            <name>linux</name>
+            <arch>amd64</arch>
+          </os>
+        </activation>
+        <build>
+          <plugins>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>exec-maven-plugin</artifactId>
+              <executions>
+                <execution>
+                  <id>build-nb-appimage</id>
+                  <phase>package</phase>
+                  <goals><goal>exec</goal></goals>
+                  <configuration>
+                    <basedir>${project.basedir}</basedir>
+                    <executable>${project.basedir}/build-bin.sh</executable>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
+      <profile>
             <id>enforce</id>
             <activation>
                 <activeByDefault>false</activeByDefault>