* Bug 16227 fixed: WSCI added in environment

  http://bugzilla.scilab.org/16227

Change-Id: I6298b52b431cb330c9e3423c42c7a428e51a894d

diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index dcc532f..edf913c 100644 (file)
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -226,6 +226,7 @@ Bug Fixes
 * [#16208](http://bugzilla.scilab.org/show_bug.cgi?id=16208): Using 3D string matrix with old C-api gateways may crash Scilab.
 * [#16209](http://bugzilla.scilab.org/show_bug.cgi?id=16209): grand() causes a freeze after several consecutive calls when using default base generator.
 * [#16210](http://bugzilla.scilab.org/show_bug.cgi?id=16210): The uicontrol.units = "normalized" property was not described.
+* [#16227](http://bugzilla.scilab.org/show_bug.cgi?id=16227): `WSCI` was not defined as environment variable and could not be used as `%WSCI%` in commands sent with `host()` or `unix_*()`.
 * [#16242](http://bugzilla.scilab.org/show_bug.cgi?id=16242): `loadmatfile()` could not read Octave native text data files.
 * [#16257](http://bugzilla.scilab.org/show_bug.cgi?id=16257): `blockdiag()` implemented to replace `sysdiag()`, improved and extended to strings.
 * [#16263](http://bugzilla.scilab.org/show_bug.cgi?id=16263): Polynomial insertion was broken for complex case.

diff --git a/scilab/etc/scilab.start b/scilab/etc/scilab.start
index f360daf..949509b 100644 (file)
--- a/scilab/etc/scilab.start
+++ b/scilab/etc/scilab.start
@@ -30,6 +30,13 @@ global %modalWarning;
 %modalWarning = %F;
 clear %modalWarning;
 
+// Add WSCI as environment variable ===================================
+if getos()=="Windows" then
+    setenv("WSCI", WSCI)
+else
+    setenv("WSCI", SCI)    // for code portability
+end
+
 // Create some configuration variables ================================
 PWD = pwd();
 

diff --git a/scilab/modules/core/tests/nonreg_tests/bug_16227.tst b/scilab/modules/core/tests/nonreg_tests/bug_16227.tst
new file mode 100644 (file)
index 0000000..6d8b176
--- /dev/null
+++ b/scilab/modules/core/tests/nonreg_tests/bug_16227.tst
@@ -0,0 +1,25 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2019 - Samuel GOUGEON
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 16227 -->
+//
+// <-- CLI SHELL MODE -->
+// <-- NO CHECK REF -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/16227
+//
+// <-- Short Description -->
+// WSCI was not available among environment variables
+
+assert_checkequal(getenv("WSCI"), WSCI)
+
+if getos()=="Windows" then
+    assert_checktrue(dos("dir %WSCI%"))
+else
+    assert_checkequal(host("ls $WSCI"), 0)
+end