From 58863b59f7b7e20fa78e28b7a7434d2f1a64bdd2 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 26 May 2011 13:33:16 +0000 Subject: [PATCH] - updated linux installer with tomreyns changes --- .../mojosetup/megaglest-installer/make.sh | 12 ++--- .../scripts/app_localization.lua | 47 +++++++++++-------- .../megaglest-installer/scripts/config.lua | 20 +++++--- 3 files changed, 46 insertions(+), 33 deletions(-) diff --git a/mk/linux/mojosetup/megaglest-installer/make.sh b/mk/linux/mojosetup/megaglest-installer/make.sh index a5ab01cc..88a1f77b 100755 --- a/mk/linux/mojosetup/megaglest-installer/make.sh +++ b/mk/linux/mojosetup/megaglest-installer/make.sh @@ -64,7 +64,7 @@ if [ "$1" = "--debug" -o "$2" = "--debug" ]; then DEBUG=1 fi if [ "$1" = "--repackonly" -o "$2" = "--repackonly" ]; then - echo "reacking installer only!" + echo "repacking installer only!" REPACKONLY=1 fi @@ -125,7 +125,7 @@ mkdir image/scripts mkdir image/data mkdir image/meta -# This next section copies live data from the mega-glest folders +# This next section copies live data from the MegaGlest directories if [ $REPACKONLY -eq 0 ]; then rm -rf data @@ -136,7 +136,7 @@ if [ $REPACKONLY -eq 0 ]; then INSTALLDATADIR="${INSTALL_ROOTDIR}data/" # Now copy all megaglest binaries - echo Copying live Mega Glest binary files... + echo Copying live MegaGlest binary files... cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/megaglest" ${INSTALLDATADIR} @@ -153,12 +153,12 @@ if [ $REPACKONLY -eq 0 ]; then cp "$CURRENTDIR/$megaglest_linux_path/makedeps_folder.sh" $INSTALL_ROOTDIR # Now copy all blender related files - echo Copying blender modelling Mega Glest files... + echo Copying blender modelling MegaGlest files... svn export --force "$CURRENTDIR/${megaglest_linux_toolspath}/glexemel/" "${INSTALLDATADIR}blender/" # Now copy all glest data - echo Copying live Mega Glest data files... + echo Copying live MegaGlest data files... cp "$CURRENTDIR/$megaglest_data_path/configuration.xml" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_data_path/megaglest.ico" $INSTALLDATADIR @@ -183,7 +183,7 @@ if [ $REPACKONLY -eq 0 ]; then svn export --force "$CURRENTDIR/$megaglest_data_path/tutorials/" "$INSTALLDATADIR/tutorials/" # Now copy all megaglest data - echo Copying live Mega Glest country logo files... + echo Copying live MegaGlest country logo files... mkdir -p "${INSTALLDATADIR}data/core/misc_textures/" svn export --force "$CURRENTDIR/$megaglest_linux_masterserverpath/flags/" "${INSTALLDATADIR}data/core/misc_textures/flags/" diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/app_localization.lua b/mk/linux/mojosetup/megaglest-installer/scripts/app_localization.lua index 94452281..6c699de1 100644 --- a/mk/linux/mojosetup/megaglest-installer/scripts/app_localization.lua +++ b/mk/linux/mojosetup/megaglest-installer/scripts/app_localization.lua @@ -5,32 +5,39 @@ MojoSetup.applocalization = { ["Uninstall complete"] = { en = "Uninstall complete. You may also delete '.megaglest' in your home directory to remove personal savegames and settings.", - en = "Uninstall complete.", de = "Deinstallation komplett.", es = "Desinstalación completa.", pl = "Usuwanie zakończone.", it = "Disinstallazione completata. Se desideri cancellare i salvataggi e le impostazione cancella '.megaglest' nella tua directory home.", }; - ["Megaglest README"] = { - de = "Megaglest-README", + ["MegaGlest README"] = { + de = "MegaGlest README-Datei", es = "LEEME", - pl = "Megaglest README", - it = "Informazioni su Megaglest", + pl = "MegaGlest README", + it = "Informazioni su MegaGlest", }; ["docs/README"] = { }; - ["Megaglest License"] = { - en = "Megaglest Licence", - de = "Megaglest-Lizenz", - es = "Licencia de uso de Megaglest", - pl = "Licencja Megaglest", - it = "Licenza di Megaglest", + ["MegaGlest Game License"] = { + en = "MegaGlest Game Licence", + de = "MegaGlest-Lizenz (Spiel)", + es = "Licencia de uso de MegaGlest", + pl = "Licencja MegaGlest", + it = "Licenza di MegaGlest", }; - ["Megaglest Uninstall Title"] = { + ["MegaGlest Data License"] = { + en = "MegaGlest Data Licence", + de = "MegaGlest-Lizenz (Daten)", + es = "Licencia de uso de MegaGlest", + pl = "Licencja MegaGlest", + it = "Licenza di MegaGlest", + }; + + ["MegaGlest Uninstall Title"] = { en = "Remove previous version", de = "Remove previous version", es = "Remove previous version", @@ -38,15 +45,15 @@ MojoSetup.applocalization = { it = "Remove previous version", }; - ["Megaglest Uninstall Prompt"] = { - en = "We have detected a previous installation of Megaglest, should we remove it?", - de = "We have detected a previous installation of Megaglest, should we remove it?", - es = "We have detected a previous installation of Megaglest, should we remove it?", - pl = "We have detected a previous installation of Megaglest, should we remove it?", - it = "We have detected a previous installation of Megaglest, should we remove it?", + ["MegaGlest Uninstall Prompt"] = { + en = "We have detected a previous installation of MegaGlest, should we remove it?", + de = "We have detected a previous installation of MegaGlest, should we remove it?", + es = "We have detected a previous installation of MegaGlest, should we remove it?", + pl = "We have detected a previous installation of MegaGlest, should we remove it?", + it = "We have detected a previous installation of MegaGlest, should we remove it?", }; - ["Megaglest Visit Website Title"] = { + ["MegaGlest Visit Website Title"] = { en = "Visit megaglest.org", de = "Visit megaglest.org", es = "Visit megaglest.org", @@ -54,7 +61,7 @@ MojoSetup.applocalization = { it = "Visit megaglest.org", }; - ["Megaglest Visit Website Prompt"] = { + ["MegaGlest Visit Website Prompt"] = { en = "Would you like to view our getting started page on megaglest.org?", de = "Would you like to view our getting started page on megaglest.org?", es = "Would you like to view our getting started page on megaglest.org?", diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua index 062b2d99..af5d854a 100644 --- a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua +++ b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua @@ -7,7 +7,7 @@ Setup.Package { vendor = "megaglest.org", id = "megaglest", - description = _("Mega Glest v" .. GAME_VERSION), + description = _("MegaGlest v" .. GAME_VERSION), version = GAME_VERSION, splash = "glestforumsheader.bmp", superuser = false, @@ -33,7 +33,7 @@ Setup.Package end if previousPath ~= '' then - if MojoSetup.promptyn(_("Megaglest Uninstall Title"), _("Megaglest Uninstall Prompt") .. '\n\n[' .. previousPath .. ']') then + if MojoSetup.promptyn(_("MegaGlest Uninstall Title"), _("MegaGlest Uninstall Prompt") .. '\n\n[' .. previousPath .. ']') then os.execute(previousPath .. 'uninstall-megaglest.sh') end @@ -63,7 +63,7 @@ Setup.Package end, postinstall = function(package) - if MojoSetup.promptyn(_("Megaglest Visit Website Title"), _("Megaglest Visit Website Prompt")) then + if MojoSetup.promptyn(_("MegaGlest Visit Website Title"), _("MegaGlest Visit Website Prompt")) then MojoSetup.launchbrowser("http://megaglest.org/get-started.html") end end, @@ -82,13 +82,19 @@ Setup.Package Setup.Eula { - description = _("Megaglest License"), - source = _("docs/README.data-license.txt") + description = _("MegaGlest Game License"), + source = _("docs/gnu_gpl_3.0.txt") + }, + + Setup.Eula + { + description = _("MegaGlest Data License"), + source = _("docs/cc-by-sa-3.0-unported.txt") }, Setup.Readme { - description = _("Megaglest README"), + description = _("MegaGlest README"), source = _("docs/README.txt") }, @@ -98,7 +104,7 @@ Setup.Package required = true, disabled = false, bytes = GAME_INSTALL_SIZE, - description = _("Mega Glest v" .. GAME_VERSION), + description = _("MegaGlest v" .. GAME_VERSION), Setup.File {