Skip to content

Commit

Permalink
Fix issue openalea#43. Error in the geenration of bat activate script…
Browse files Browse the repository at this point in the history
… on Windows.
  • Loading branch information
pradal committed Mar 29, 2021
1 parent acb60e8 commit d6da335
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "2.1.9" %}
{% set version = "2.2.0" %}

package:
name: openalea.deploy
Expand Down
20 changes: 10 additions & 10 deletions src/openalea/deploy/environ_var.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,29 +81,29 @@ def get_posix_deactivate_export_str(vars):

def get_win32_activate_export_str(vars):
# Build string
exportstr = "############ Configuration ############\n\n"
exportstr = "REM ######### Configuration ############\n\n"

for newvar in vars:

vname, value = newvar.split('=')

if ((vname == "PATH") and value):
exportstr += 'if [ -z "$%s" ]; then\n' % (vname)
exportstr += ' export %s=%s\n' % (vname, value,)
exportstr += 'else\n'
exportstr += ' export %s=%s:$%s\n' % (vname, value, vname,)
exportstr += 'fi\n\n'
exportstr += 'IF "%{0}%"=="" (\n'.format(vname)
exportstr += ' SET {0}={1}\n'.format(vname, value)
exportstr += ') ELSE (\n'
exportstr += ' SET {0}={1};%{2}%\n'.format(vname, value, vname,)
exportstr += ')\n\n'

elif (vname and value):
exportstr += 'export %s=%s\n\n' % (vname, value)
exportstr += 'SET %s=%s\n\n' % (vname, value)

exportstr += "############ Configuration END ########"
exportstr += "REM ######### Configuration END ########"
return exportstr


def get_win32_deactivate_export_str(vars):
# Build string
exportstr = "############ Configuration ############\n\n"
exportstr = "REM ############ Configuration ############\n\n"

for newvar in vars:

Expand All @@ -112,7 +112,7 @@ def get_win32_deactivate_export_str(vars):
if (vname == "PATH"):
continue
else:
exportstr += 'set %s=\n' % vname
exportstr += 'SET %s=\n' % vname

exportstr += "############ Configuration END ########"
return exportstr
Expand Down
4 changes: 2 additions & 2 deletions src/openalea/deploy/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
major = 2
"""(int) Version major component."""

minor = 1
minor = 2
"""(int) Version minor component."""

post = 9
post = 0
"""(int) Version post or bugfix component."""

__version__ = ".".join([str(s) for s in (major, minor, post)])
Expand Down

0 comments on commit d6da335

Please sign in to comment.