- updated linux installer with tomreyns changes

This commit is contained in:
Mark Vejvoda 2011-05-26 13:33:16 +00:00
parent 1e65f6f74e
commit 58863b59f7
3 changed files with 46 additions and 33 deletions

View File

@ -64,7 +64,7 @@ if [ "$1" = "--debug" -o "$2" = "--debug" ]; then
DEBUG=1 DEBUG=1
fi fi
if [ "$1" = "--repackonly" -o "$2" = "--repackonly" ]; then if [ "$1" = "--repackonly" -o "$2" = "--repackonly" ]; then
echo "reacking installer only!" echo "repacking installer only!"
REPACKONLY=1 REPACKONLY=1
fi fi
@ -125,7 +125,7 @@ mkdir image/scripts
mkdir image/data mkdir image/data
mkdir image/meta 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 if [ $REPACKONLY -eq 0 ]; then
rm -rf data rm -rf data
@ -136,7 +136,7 @@ if [ $REPACKONLY -eq 0 ]; then
INSTALLDATADIR="${INSTALL_ROOTDIR}data/" INSTALLDATADIR="${INSTALL_ROOTDIR}data/"
# Now copy all megaglest binaries # 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/start_megaglest" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/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 cp "$CURRENTDIR/$megaglest_linux_path/makedeps_folder.sh" $INSTALL_ROOTDIR
# Now copy all blender related files # 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/" svn export --force "$CURRENTDIR/${megaglest_linux_toolspath}/glexemel/" "${INSTALLDATADIR}blender/"
# Now copy all glest data # 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/configuration.xml" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_data_path/megaglest.ico" $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/" svn export --force "$CURRENTDIR/$megaglest_data_path/tutorials/" "$INSTALLDATADIR/tutorials/"
# Now copy all megaglest data # 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/" mkdir -p "${INSTALLDATADIR}data/core/misc_textures/"
svn export --force "$CURRENTDIR/$megaglest_linux_masterserverpath/flags/" "${INSTALLDATADIR}data/core/misc_textures/flags/" svn export --force "$CURRENTDIR/$megaglest_linux_masterserverpath/flags/" "${INSTALLDATADIR}data/core/misc_textures/flags/"

View File

@ -5,32 +5,39 @@
MojoSetup.applocalization = { MojoSetup.applocalization = {
["Uninstall complete"] = { ["Uninstall complete"] = {
en = "Uninstall complete. You may also delete '.megaglest' in your home directory to remove personal savegames and settings.", en = "Uninstall complete. You may also delete '.megaglest' in your home directory to remove personal savegames and settings.",
en = "Uninstall complete.",
de = "Deinstallation komplett.", de = "Deinstallation komplett.",
es = "Desinstalación completa.", es = "Desinstalación completa.",
pl = "Usuwanie zakończone.", pl = "Usuwanie zakończone.",
it = "Disinstallazione completata. Se desideri cancellare i salvataggi e le impostazione cancella '.megaglest' nella tua directory home.", it = "Disinstallazione completata. Se desideri cancellare i salvataggi e le impostazione cancella '.megaglest' nella tua directory home.",
}; };
["Megaglest README"] = { ["MegaGlest README"] = {
de = "Megaglest-README", de = "MegaGlest README-Datei",
es = "LEEME", es = "LEEME",
pl = "Megaglest README", pl = "MegaGlest README",
it = "Informazioni su Megaglest", it = "Informazioni su MegaGlest",
}; };
["docs/README"] = { ["docs/README"] = {
}; };
["Megaglest License"] = { ["MegaGlest Game License"] = {
en = "Megaglest Licence", en = "MegaGlest Game Licence",
de = "Megaglest-Lizenz", de = "MegaGlest-Lizenz (Spiel)",
es = "Licencia de uso de Megaglest", es = "Licencia de uso de MegaGlest",
pl = "Licencja Megaglest", pl = "Licencja MegaGlest",
it = "Licenza di 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", en = "Remove previous version",
de = "Remove previous version", de = "Remove previous version",
es = "Remove previous version", es = "Remove previous version",
@ -38,15 +45,15 @@ MojoSetup.applocalization = {
it = "Remove previous version", it = "Remove previous version",
}; };
["Megaglest Uninstall Prompt"] = { ["MegaGlest Uninstall Prompt"] = {
en = "We have detected a previous installation of Megaglest, should we remove it?", 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?", 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?", 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?", 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?", 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", en = "Visit megaglest.org",
de = "Visit megaglest.org", de = "Visit megaglest.org",
es = "Visit megaglest.org", es = "Visit megaglest.org",
@ -54,7 +61,7 @@ MojoSetup.applocalization = {
it = "Visit megaglest.org", 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?", 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?", 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?", es = "Would you like to view our getting started page on megaglest.org?",

View File

@ -7,7 +7,7 @@ Setup.Package
{ {
vendor = "megaglest.org", vendor = "megaglest.org",
id = "megaglest", id = "megaglest",
description = _("Mega Glest v" .. GAME_VERSION), description = _("MegaGlest v" .. GAME_VERSION),
version = GAME_VERSION, version = GAME_VERSION,
splash = "glestforumsheader.bmp", splash = "glestforumsheader.bmp",
superuser = false, superuser = false,
@ -33,7 +33,7 @@ Setup.Package
end end
if previousPath ~= '' then 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') os.execute(previousPath .. 'uninstall-megaglest.sh')
end end
@ -63,7 +63,7 @@ Setup.Package
end, end,
postinstall = function(package) 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") MojoSetup.launchbrowser("http://megaglest.org/get-started.html")
end end
end, end,
@ -82,13 +82,19 @@ Setup.Package
Setup.Eula Setup.Eula
{ {
description = _("Megaglest License"), description = _("MegaGlest Game License"),
source = _("docs/README.data-license.txt") source = _("docs/gnu_gpl_3.0.txt")
},
Setup.Eula
{
description = _("MegaGlest Data License"),
source = _("docs/cc-by-sa-3.0-unported.txt")
}, },
Setup.Readme Setup.Readme
{ {
description = _("Megaglest README"), description = _("MegaGlest README"),
source = _("docs/README.txt") source = _("docs/README.txt")
}, },
@ -98,7 +104,7 @@ Setup.Package
required = true, required = true,
disabled = false, disabled = false,
bytes = GAME_INSTALL_SIZE, bytes = GAME_INSTALL_SIZE,
description = _("Mega Glest v" .. GAME_VERSION), description = _("MegaGlest v" .. GAME_VERSION),
Setup.File Setup.File
{ {