Merge branch 'master' into 'master'

Fix references to Canary in update scripts

See merge request !1
This commit is contained in:
Christopher J. Gilbert 2017-08-21 04:30:13 +00:00
commit 2d5ddbe923
3 changed files with 29 additions and 29 deletions

View file

@ -12,18 +12,18 @@ Component.prototype.createOperations = function()
{ {
component.createOperations(); component.createOperations();
component.addOperation("CreateDesktopEntry", "citra-bleeding-edge.desktop", component.addOperation("CreateDesktopEntry", "citra-canary.desktop",
"Version=1.0" + "Version=1.0\n" +
"Type=Application" + "Type=Application\n" +
"Name=Citra Bleeding Edge" + "Name=Citra Canary\n" +
"GenericName=3DS Emulator" + "GenericName=3DS Emulator\n" +
"GenericName[fr]=Émulateur 3DS" + "GenericName[fr]=Émulateur 3DS\n" +
"Comment=Nintendo 3DS video game console emulator" + "Comment=Nintendo 3DS video game console emulator\n" +
"Comment[fr]=Émulateur de console de jeu Nintendo 3DS" + "Comment[fr]=Émulateur de console de jeu Nintendo 3DS\n" +
"Icon=citra" + "Icon=citra\n" +
"TryExec=@TargetDir@/bleeding/citra-qt" + "TryExec=@TargetDir@/canary/citra-qt\n" +
"Exec=@TargetDir@/bleeding/citra-qt %f" + "Exec=@TargetDir@/canary/citra-qt %f\n" +
"Categories=Game;Emulator;Qt;" + "Categories=Game;Emulator;Qt;\n" +
"MimeType=application/x-ctr-3dsx;application/x-ctr-cci;application/x-ctr-cia;application/x-ctr-cxi;" + "MimeType=application/x-ctr-3dsx;application/x-ctr-cci;application/x-ctr-cia;application/x-ctr-cxi;\n" +
"Keywords=3DS;Nintendo;"); "Keywords=3DS;Nintendo;\n");
} }

View file

@ -13,17 +13,17 @@ Component.prototype.createOperations = function()
component.createOperations(); component.createOperations();
component.addOperation("CreateDesktopEntry", "citra.desktop", component.addOperation("CreateDesktopEntry", "citra.desktop",
"Version=1.0" + "Version=1.0\n" +
"Type=Application" + "Type=Application\n" +
"Name=Citra" + "Name=Citra\n" +
"GenericName=3DS Emulator" + "GenericName=3DS Emulator\n" +
"GenericName[fr]=Émulateur 3DS" + "GenericName[fr]=Émulateur 3DS\n" +
"Comment=Nintendo 3DS video game console emulator" + "Comment=Nintendo 3DS video game console emulator\n" +
"Comment[fr]=Émulateur de console de jeu Nintendo 3DS" + "Comment[fr]=Émulateur de console de jeu Nintendo 3DS\n" +
"Icon=citra" + "Icon=citra\n" +
"TryExec=@TargetDir@/nightly/citra-qt" + "TryExec=@TargetDir@/nightly/citra-qt\n" +
"Exec=@TargetDir@/nightly/citra-qt %f" + "Exec=@TargetDir@/nightly/citra-qt %f\n" +
"Categories=Game;Emulator;Qt;" + "Categories=Game;Emulator;Qt;\n" +
"MimeType=application/x-ctr-3dsx;application/x-ctr-cci;application/x-ctr-cia;application/x-ctr-cxi;" + "MimeType=application/x-ctr-3dsx;application/x-ctr-cci;application/x-ctr-cia;application/x-ctr-cxi;\n" +
"Keywords=3DS;Nintendo;"); "Keywords=3DS;Nintendo;\n");
} }

View file

@ -12,6 +12,6 @@ Component.prototype.createOperations = function()
{ {
component.createOperations(); component.createOperations();
component.addOperation("CreateShortcut", "@TargetDir@/bleeding/citra-qt.exe", "@StartMenuDir@/Citra-Bleeding.lnk", component.addOperation("CreateShortcut", "@TargetDir@/canary/citra-qt.exe", "@StartMenuDir@/Citra Canary.lnk",
"workingDirectory=@TargetDir@/bleeding"); "workingDirectory=@TargetDir@/canary");
} }