Mercurial Repositories > eric / changeset
changeset
Fixed some install script issues related to defining the bin dir via -b switch.
Wed, 02 May 2018 18:39:09 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 02 May 2018 18:39:09 +0200
- changeset 6275
- 8ce9f9c467ec
- parent 6272
- b8006def4317
- child 6276
- 629b1ff9ab90
Fixed some install script issues related to defining the bin dir via -b switch.
| eric6_browser.desktop | file | annotate | diff | comparison | revisions | |
| eric6_webbrowser.desktop | file | annotate | diff | comparison | revisions | |
| install.py | file | annotate | diff | comparison | revisions |
--- a/eric6_browser.desktop Mon Apr 30 14:45:03 2018 +0200 +++ b/eric6_browser.desktop Wed May 02 18:39:09 2018 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 Type=Application -Exec=eric6_browser@MARKER@ +Exec=@BINDIR@/eric6_browser@MARKER@ MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-mimearchive; Icon=ericWeb@MARKER@ Terminal=false
--- a/eric6_webbrowser.desktop Mon Apr 30 14:45:03 2018 +0200 +++ b/eric6_webbrowser.desktop Wed May 02 18:39:09 2018 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 Type=Application -Exec=eric6_webbrowser@MARKER@ +Exec=@BINDIR@/eric6_webbrowser@MARKER@ MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https; Icon=ericWeb@MARKER@ Terminal=false
--- a/install.py Mon Apr 30 14:45:03 2018 +0200 +++ b/install.py Wed May 02 18:39:09 2018 +0200 @@ -302,7 +302,7 @@ @param dst destination file name (string) @param marker marker to be used (string) """ - global cfg + global cfg, platBinDir if sys.version_info[0] == 2: f = codecs.open(src, "r", "utf-8") @@ -311,7 +311,7 @@ text = f.read() f.close() - text = text.replace("@BINDIR@", cfg['bindir']) + text = text.replace("@BINDIR@", platBinDir) text = text.replace("@MARKER@", marker) if marker: t_marker = " ({0})".format(PythonTextMarkers[marker])
