Netzwerkscript beinahe vollendet.

[people/pmueller/ipfire-2.x.git] / src / install+setup / setup / main.c

diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c
index 44900e2fd224b8ace1eb3f0cb41ed72510875e57..f168220e10183055f9a70ef91e19cb1cb044bc59 100644 (file)
--- a/src/install+setup/setup/main.c
+++ b/src/install+setup/setup/main.c
@@ -21,36 +21,14 @@ char **ctr = NULL;
 
 int automode = 0;
 
-extern char *bz_tr[];
-extern char *cs_tr[];
-extern char *da_tr[];
 extern char *en_tr[];
-extern char *es_tr[];
-extern char *fi_tr[];
-extern char *fr_tr[];
-extern char *hu_tr[];
-extern char *la_tr[];
-extern char *nl_tr[];
 extern char *de_tr[];
-extern char *tr_tr[];
-extern char *it_tr[];
-extern char *el_tr[];
-extern char *sk_tr[];
-extern char *so_tr[];
-extern char *sv_tr[];
-extern char *no_tr[];
-extern char *pl_tr[];
-extern char *pt_tr[];
-extern char *vi_tr[];
 
 int main(int argc, char *argv[])
 {
 #ifdef  LANG_EN_ONLY
        char *shortlangnames[] = { "en", NULL };
        char **langtrs[] = { en_tr, NULL };
-#elifdef LANG_ALL
-       char *shortlangnames[] = { "bz", "cs", "da", "de", "en", "es", "fr", "el", "it", "la", "hu", "nl", "no", "pl", "pt", "sk", "so", "fi", "sv", "tr", "vi", NULL };
-       char **langtrs[] = { bz_tr, cs_tr, da_tr, de_tr, en_tr, es_tr, fr_tr, el_tr, it_tr, la_tr, hu_tr, nl_tr, no_tr, pl_tr, pt_tr, sk_tr, so_tr, fi_tr, sv_tr, tr_tr, vi_tr, NULL };
 #else
        char *shortlangnames[] = { "de", "en", NULL };
        char **langtrs[] = { de_tr, en_tr, NULL };
@@ -68,7 +46,7 @@ int main(int argc, char *argv[])
        if (argc >= 2)
                mylog = argv[1];
        else
-               mylog = strdup("/root/setup.log");
+               mylog = strdup("/var/log/setup.log");
 
        if (!(flog = fopen(mylog, "w+")))
        {
@@ -131,7 +109,7 @@ int main(int argc, char *argv[])
                title[strlen(title) - 1] = '\0';
            fclose (f_title);
        } else {
-           sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN);
+           sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
        }
        newtDrawRootText(14, 0, title);
        newtPushHelpLine(ctr[TR_HELPLINE]);             
@@ -214,17 +192,17 @@ int main(int argc, char *argv[])
 EXIT:  
        if (automode != 0)
        {
-               sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN);
+               sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
                if (autook)
                        newtWinMessage(title, ctr[TR_OK], ctr[TR_SETUP_FINISHED]);
                else
                        newtWinMessage(ctr[TR_WARNING], ctr[TR_OK], ctr[TR_SETUP_NOT_COMPLETE]);
        }
-       
+
        fprintf(flog, "Setup program ended.\n");
        fflush(flog);
        fclose(flog);
-               
+
        newtFinished();
 
        return 0;