cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject git commit: assume python is on path for windows for cqlsh.bat patch by mstepura reviewed by dbrosius for cassandra-6145
Date Fri, 25 Oct 2013 04:16:17 GMT
Updated Branches:
  refs/heads/cassandra-1.2 1f4070dbf -> 08a22729a


assume python is on path for windows for cqlsh.bat
patch by mstepura reviewed by dbrosius for cassandra-6145


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08a22729
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08a22729
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08a22729

Branch: refs/heads/cassandra-1.2
Commit: 08a22729afedb53dfa988b3e2db34b7a743977de
Parents: 1f4070d
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Fri Oct 25 00:14:30 2013 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Fri Oct 25 00:14:30 2013 -0400

----------------------------------------------------------------------
 bin/cqlsh.bat | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/08a22729/bin/cqlsh.bat
----------------------------------------------------------------------
diff --git a/bin/cqlsh.bat b/bin/cqlsh.bat
index e54aebf..a61df21 100644
--- a/bin/cqlsh.bat
+++ b/bin/cqlsh.bat
@@ -1,5 +1,30 @@
-@echo off
+@REM
+@REM  Licensed to the Apache Software Foundation (ASF) under one or more
+@REM  contributor license agreements.  See the NOTICE file distributed with
+@REM  this work for additional information regarding copyright ownership.
+@REM  The ASF licenses this file to You under the Apache License, Version 2.0
+@REM  (the "License"); you may not use this file except in compliance with
+@REM  the License.  You may obtain a copy of the License at
+@REM
+@REM      http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM  Unless required by applicable law or agreed to in writing, software
+@REM  distributed under the License is distributed on an "AS IS" BASIS,
+@REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM  See the License for the specific language governing permissions and
+@REM  limitations under the License.
 
-set DSDIR=%~dp0..
+if "%OS%" == "Windows_NT" setlocal
 
-"%DSDIR%\python\python.exe" "%DSDIR%\apache-cassandra\bin\cqlsh" %*
\ No newline at end of file
+python -V >nul 2>&1
+if ERRORLEVEL 1 goto err
+
+python "%~dp0\cqlsh" %*
+goto finally
+
+:err
+echo Can't detect Python version!
+
+:finally
+
+ENDLOCAL


Mime
View raw message