You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2015/04/05 14:59:31 UTC

incubator-zeppelin git commit: [HOTFIX] Code convention

Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master e0ac5be0b -> f11cdf699


[HOTFIX] Code convention

- Fixed style guide.
- Followed by #20

Author: Jongyoul Lee <jo...@gmail.com>

Closes #25 from jongyoul/ZEPPELIN-13-HOTFIX and squashes the following commits:

1c4ac3e [Jongyoul Lee] [ZEPPELIN-13] ZEPPELIN_CONF_DIR cannot be reached until ZEPPELIN_CONF_DIR become set - Fixed style guide.
1348463 [Jongyoul Lee] [ZEPPELIN-13] ZEPPELIN_CONF_DIR cannot be reached until ZEPPELIN_CONF_DIR become set - Fixed style guide.


Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/f11cdf69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/f11cdf69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/f11cdf69

Branch: refs/heads/master
Commit: f11cdf699e1cd72763d2599668884b88910dc66b
Parents: e0ac5be
Author: Jongyoul Lee <jo...@gmail.com>
Authored: Thu Apr 2 23:44:55 2015 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Sun Apr 5 21:59:24 2015 +0900

----------------------------------------------------------------------
 bin/zeppelin-daemon.sh | 10 ++++------
 bin/zeppelin.sh        | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f11cdf69/bin/zeppelin-daemon.sh
----------------------------------------------------------------------
diff --git a/bin/zeppelin-daemon.sh b/bin/zeppelin-daemon.sh
index e4cd4b8..b5aaeff 100755
--- a/bin/zeppelin-daemon.sh
+++ b/bin/zeppelin-daemon.sh
@@ -23,17 +23,15 @@
 
 USAGE="Usage: zeppelin-daemon.sh [--config <conf-dir>] {start|stop|restart|reload|status}"
 
-if [ "$1" == "--config" ]
-then
+if [[ "$1" == "--config" ]]; then
   shift
   conf_dir="$1"
-  if [ ! -d "$conf_dir" ]
-  then
-    echo "ERROR : $conf_dir is not a directory"
+  if [[ ! -d "${conf_dir}" ]]; then
+    echo "ERROR : ${conf_dir} is not a directory"
     echo ${USAGE}
     exit 1
   else
-    export ZEPPELIN_CONF_DIR="$conf_dir"
+    export ZEPPELIN_CONF_DIR="${conf_dir}"
   fi
   shift
 fi

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f11cdf69/bin/zeppelin.sh
----------------------------------------------------------------------
diff --git a/bin/zeppelin.sh b/bin/zeppelin.sh
index e634fe1..87dd7df 100755
--- a/bin/zeppelin.sh
+++ b/bin/zeppelin.sh
@@ -26,17 +26,15 @@ function usage() {
   exit 0
 }
 
-if [ "$1" == "--config" ]
-then
+if [[ "$1" == "--config" ]]; then
   shift
   conf_dir="$1"
-  if [ ! -d "$conf_dir" ]
-  then
-    echo "ERROR : $conf_dir is not a directory"
+  if [[ ! -d "{$conf_dir}" ]]; then
+    echo "ERROR : ${conf_dir} is not a directory"
     echo ${USAGE}
     exit 1
   else
-    export ZEPPELIN_CONF_DIR="$conf_dir"
+    export ZEPPELIN_CONF_DIR="${conf_dir}"
   fi
   shift
 fi