Merge branch 'master' into draft

huckjane · Dec 30, 2019 · 517b46b · 517b46b
2 parents e4ecb0c + 16c6a3a
commit 517b46b
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/README.MD b/README.MD
@@ -46,7 +46,7 @@ $ ./datastax-studio-6.8.0.20190912-LABS/bin/server.sh
 5. (Optional) See the DataStax Documentation for any custom configurations of [DataStax Graph](https://docs.datastax.com/en/dse/6.0/dse-dev/datastax_enterprise/graph/graphTOC.html) or [DataStax Studio](https://docs.datastax.com/en/studio/6.0/index.html). This is not necessary for using this repository of examples.
 
 Setting up DataStax Bulk Loader via a tarball:
-1. Download our Linus distribution of [DataStax Bulk Loader](https://downloads.datastax.com/#bulk-loader)
+1. Download our Linux distribution of [DataStax Bulk Loader](https://downloads.datastax.com/#bulk-loader)
 2. Untar the distribution:
 ```tar -xvzf dsbulk-1.4.1.tar.gz```
 3. Make note of the path to the top level directory of DataStax Bulk Loader.

diff --git a/data/ch10/ch10_load.sh b/data/ch10/ch10_load.sh
@@ -16,7 +16,7 @@ DEST_KS=${DEST_KS:-$DEFAULT_DESK_KS}
 
 # collect directory variables
 OLDWD="`pwd`"
-SCRIPTIR="`dirname $0`"
+SCRIPTDIR="`dirname $0`"
 cd "$SCRIPTDIR"
 
 # determine which dsbulk to use, in the case you already have it installed

diff --git a/data/ch12/ch12_load_production.sh b/data/ch12/ch12_load_production.sh
@@ -16,7 +16,7 @@ DEST_KS=${DEST_KS:-$DEFAULT_DESK_KS}
 
 # collect directory variables
 OLDWD="`pwd`"
-SCRIPTIR="`dirname $0`"
+SCRIPTDIR="`dirname $0`"
 cd "$SCRIPTDIR"
 
 # determine which dsbulk to use, in the case you already have it installed

diff --git a/data/ch12/ch12_load_shortcut_example.sh b/data/ch12/ch12_load_shortcut_example.sh
@@ -16,7 +16,7 @@ DEST_KS=${DEST_KS:-$DEFAULT_DESK_KS}
 
 # collect directory variables
 OLDWD="`pwd`"
-SCRIPTIR="`dirname $0`"
+SCRIPTDIR="`dirname $0`"
 cd "$SCRIPTDIR"
 
 # determine which dsbulk to use, in the case you already have it installed

diff --git a/data/ch4/ch4_load.sh b/data/ch4/ch4_load.sh
@@ -16,7 +16,7 @@ DEST_KS=${DEST_KS:-$DEFAULT_DESK_KS}
 
 # collect directory variables
 OLDWD="`pwd`"
-SCRIPTIR="`dirname $0`"
+SCRIPTDIR="`dirname $0`"
 cd "$SCRIPTDIR"
 
 # determine which dsbulk to use, in the case you already have it installed

diff --git a/data/ch5/ch5_load.sh b/data/ch5/ch5_load.sh
@@ -16,7 +16,7 @@ DEST_KS=${DEST_KS:-$DEFAULT_DESK_KS}
 
 # collect directory variables
 OLDWD="`pwd`"
-SCRIPTIR="`dirname $0`"
+SCRIPTDIR="`dirname $0`"
 cd "$SCRIPTDIR"
 
 # determine which dsbulk to use, in the case you already have it installed

diff --git a/data/ch6/ch6_load.sh b/data/ch6/ch6_load.sh
@@ -16,7 +16,7 @@ DEST_KS=${DEST_KS:-$DEFAULT_DESK_KS}
 
 # collect directory variables
 OLDWD="`pwd`"
-SCRIPTIR="`dirname $0`"
+SCRIPTDIR="`dirname $0`"
 cd "$SCRIPTDIR"
 
 # determine which dsbulk to use, in the case you already have it installed

diff --git a/data/ch7/ch7_load.sh b/data/ch7/ch7_load.sh
@@ -16,7 +16,7 @@ DEST_KS=${DEST_KS:-$DEFAULT_DESK_KS}
 
 # collect directory variables
 OLDWD="`pwd`"
-SCRIPTIR="`dirname $0`"
+SCRIPTDIR="`dirname $0`"
 cd "$SCRIPTDIR"
 
 # determine which dsbulk to use, in the case you already have it installed

diff --git a/data/ch8/ch8_load.sh b/data/ch8/ch8_load.sh
@@ -16,7 +16,7 @@ DEST_KS=${DEST_KS:-$DEFAULT_DESK_KS}
 
 # collect directory variables
 OLDWD="`pwd`"
-SCRIPTIR="`dirname $0`"
+SCRIPTDIR="`dirname $0`"
 cd "$SCRIPTDIR"
 DATADIR="`pwd`"
 

diff --git a/data/ch9/ch9_load.sh b/data/ch9/ch9_load.sh
@@ -16,7 +16,7 @@ DEST_KS=${DEST_KS:-$DEFAULT_DESK_KS}
 
 # collect directory variables
 OLDWD="`pwd`"
-SCRIPTIR="`dirname $0`"
+SCRIPTDIR="`dirname $0`"
 cd "$SCRIPTDIR"
 
 # determine which dsbulk to use, in the case you already have it installed