Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 587376 | Differences between
and this patch

Collapse All | Expand All

(-)eric-5.5.2/work/eric5-5.5.2/eric/install.py (-3 / +3 lines)
Lines 754-760 def installEric(): Link Here
754
                os.makedirs(dst)
754
                os.makedirs(dst)
755
            shutilCopy(
755
            shutilCopy(
756
                os.path.join(sourceDir, "icons", "default", "eric5.png"),
756
                os.path.join(sourceDir, "icons", "default", "eric5.png"),
757
                os.path.join(dst, "eric" + marker + ".png"))
757
                os.path.join(dst, "eric5" + marker + ".png"))
758
            shutilCopy(
758
            shutilCopy(
759
                os.path.join(sourceDir, "icons", "default", "ericWeb48.png"),
759
                os.path.join(sourceDir, "icons", "default", "ericWeb48.png"),
760
                os.path.join(dst, "ericWeb" + marker + ".png"))
760
                os.path.join(dst, "ericWeb" + marker + ".png"))
Lines 780-786 def installEric(): Link Here
780
        elif os.getuid() == 0:
780
        elif os.getuid() == 0:
781
            shutilCopy(os.path.join(
781
            shutilCopy(os.path.join(
782
                sourceDir, "icons", "default", "eric5.png"),
782
                sourceDir, "icons", "default", "eric5.png"),
783
                "/usr/share/pixmaps/eric" + marker + ".png")
783
                "/usr/share/pixmaps/eric5" + marker + ".png")
784
            copyDesktopFile(
784
            copyDesktopFile(
785
                os.path.join(sourceDir, "eric5.desktop"),
785
                os.path.join(sourceDir, "eric5.desktop"),
786
                "/usr/share/applications/eric5" + marker + ".desktop",
786
                "/usr/share/applications/eric5" + marker + ".desktop",
Lines 828-834 def createMacAppBundle(pydir): Link Here
828
    os.makedirs(dirs["icns"])
828
    os.makedirs(dirs["icns"])
829
    
829
    
830
    if macPythonExe == defaultMacPythonExe:
830
    if macPythonExe == defaultMacPythonExe:
831
        starter = os.path.join(dirs["exe"], "eric")
831
        starter = os.path.join(dirs["exe"], "eric5")
832
        os.symlink(macPythonExe, starter)
832
        os.symlink(macPythonExe, starter)
833
    else:
833
    else:
834
        starter = "python{0}".format(sys.version_info.major)
834
        starter = "python{0}".format(sys.version_info.major)
(-)eric-5.5.2/work/eric5-5.5.2/eric/uninstall.py (-1 / +1 lines)
Lines 108-114 def uninstallEric(): Link Here
108
                     "/usr/share/appdata/eric5" + marker + ".appdata.xml",
108
                     "/usr/share/appdata/eric5" + marker + ".appdata.xml",
109
                     "/usr/share/applications/eric5_webbrowser" + marker + 
109
                     "/usr/share/applications/eric5_webbrowser" + marker + 
110
                     ".desktop",
110
                     ".desktop",
111
                     "/usr/share/pixmaps/eric" + marker + ".png",
111
                     "/usr/share/pixmaps/eric5" + marker + ".png",
112
                     "/usr/share/pixmaps/ericWeb" + marker + ".png"]:
112
                     "/usr/share/pixmaps/ericWeb" + marker + ".png"]:
113
            if os.path.exists(name):
113
            if os.path.exists(name):
114
                os.remove(name)
114
                os.remove(name)
(-)eric-5.5.2/work/eric5-5.5.2/install.py (-3 / +3 lines)
Lines 754-760 def installEric(): Link Here
754
                os.makedirs(dst)
754
                os.makedirs(dst)
755
            shutilCopy(
755
            shutilCopy(
756
                os.path.join(sourceDir, "icons", "default", "eric5.png"),
756
                os.path.join(sourceDir, "icons", "default", "eric5.png"),
757
                os.path.join(dst, "eric" + marker + ".png"))
757
                os.path.join(dst, "eric5" + marker + ".png"))
758
            shutilCopy(
758
            shutilCopy(
759
                os.path.join(sourceDir, "icons", "default", "ericWeb48.png"),
759
                os.path.join(sourceDir, "icons", "default", "ericWeb48.png"),
760
                os.path.join(dst, "ericWeb" + marker + ".png"))
760
                os.path.join(dst, "ericWeb" + marker + ".png"))
Lines 780-786 def installEric(): Link Here
780
        elif os.getuid() == 0:
780
        elif os.getuid() == 0:
781
            shutilCopy(os.path.join(
781
            shutilCopy(os.path.join(
782
                sourceDir, "icons", "default", "eric5.png"),
782
                sourceDir, "icons", "default", "eric5.png"),
783
                "/usr/share/pixmaps/eric" + marker + ".png")
783
                "/usr/share/pixmaps/eric5" + marker + ".png")
784
            copyDesktopFile(
784
            copyDesktopFile(
785
                os.path.join(sourceDir, "eric5.desktop"),
785
                os.path.join(sourceDir, "eric5.desktop"),
786
                "/usr/share/applications/eric5" + marker + ".desktop",
786
                "/usr/share/applications/eric5" + marker + ".desktop",
Lines 828-834 def createMacAppBundle(pydir): Link Here
828
    os.makedirs(dirs["icns"])
828
    os.makedirs(dirs["icns"])
829
    
829
    
830
    if macPythonExe == defaultMacPythonExe:
830
    if macPythonExe == defaultMacPythonExe:
831
        starter = os.path.join(dirs["exe"], "eric")
831
        starter = os.path.join(dirs["exe"], "eric5")
832
        os.symlink(macPythonExe, starter)
832
        os.symlink(macPythonExe, starter)
833
    else:
833
    else:
834
        starter = "python{0}".format(sys.version_info.major)
834
        starter = "python{0}".format(sys.version_info.major)
(-)eric-5.5.2/work/eric5-5.5.2/uninstall.py (-1 / +1 lines)
Lines 108-114 def uninstallEric(): Link Here
108
                     "/usr/share/appdata/eric5" + marker + ".appdata.xml",
108
                     "/usr/share/appdata/eric5" + marker + ".appdata.xml",
109
                     "/usr/share/applications/eric5_webbrowser" + marker + 
109
                     "/usr/share/applications/eric5_webbrowser" + marker + 
110
                     ".desktop",
110
                     ".desktop",
111
                     "/usr/share/pixmaps/eric" + marker + ".png",
111
                     "/usr/share/pixmaps/eric5" + marker + ".png",
112
                     "/usr/share/pixmaps/ericWeb" + marker + ".png"]:
112
                     "/usr/share/pixmaps/ericWeb" + marker + ".png"]:
113
            if os.path.exists(name):
113
            if os.path.exists(name):
114
                os.remove(name)
114
                os.remove(name)

Return to bug 587376