Changeset 1193


Ignore:
Timestamp:
Feb 20, 2007, 12:24:22 PM (13 years ago)
Author:
bruno
Message:

Remove some useless \r in code
Remove center_string usage as it's now broiken for dynamically created strings

Location:
branches/stable
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r1177 r1193  
    344344        Die "Please install either fdformat or superformat."
    345345    fi
    346     echo -en "\rWriting $comment"
     346    echo -en "\nWriting $comment"
    347347    if echo $image | grep "mindi-[r|b]oot\.1440" &> /dev/null ; then
    348348        cat $image > $dev &
     
    11451145    [ "$mountlist" != "" ] && rm -Rf $mountlist
    11461146    > $mountlist
    1147     echo -en "\rHang on...\r"
    11481147    all_partitions=""
    11491148   
    11501149    if [ $LVM != "false" ]; then
    1151         echo -en "\rAnalyzing LVM...\r"
     1150        echo -en "Analyzing LVM...\n"
    11521151        $MINDI_LIB/analyze-my-lvm > $MINDI_TMP/lvm.res
    11531152        if [ $? -ne 0 ]; then
     
    20622061    rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
    20632062    if [ "$retval" -eq "0" ] ; then
    2064         echo -en "...$DONE\r"
     2063        echo -en "...$DONE\n"
    20652064        if [ "$KERN_DISK_MADE" ] ; then
    2066             LogIt "... $disksize KB boot disks were created OK\r"
    2067         fi
    2068     else
    2069         echo -en "...failed\r"
    2070         LogIt $disksize"KB boot disk was NOT created\r"
     2065            LogIt "$disksize KB boot disks were created OK\n"
     2066        fi
     2067    else
     2068        echo -en "...failed\n"
     2069        LogIt $disksize"KB boot disk was NOT created\n"
    20712070        rm -f $imagefile
    20722071    fi
     
    21672166
    21682167    if [ "$retval" -eq "0" ] ; then
    2169         echo -en "...$DONE\r"
     2168        echo -en "...$DONE\n"
    21702169        if [ "$KERN_DISK_MADE" ] ; then
    21712170            rm -f $imagefile
    2172             LogIt "... $disksize KB boot disks were created OK\r"
    2173         fi
    2174     else
    2175         echo -en "...failed\r"
    2176         LogIt $disksize"KB boot disk was NOT created\r"
     2171            LogIt "$disksize KB boot disks were created OK\n"
     2172        fi
     2173    else
     2174        echo -en "...failed\n"
     2175        LogIt $disksize"KB boot disk was NOT created\n"
    21772176        rm -f $imagefile
    21782177    fi
  • branches/stable/mindi/rootfs/sbin/init

    r1158 r1193  
    539539    LogIt "I think this CD/floppy has no archives on it."
    540540fi
    541 echo -en "Type 'exit' to reboot the PC\r"
     541echo -en "Type 'exit' to reboot the PC\n"
    542542umount /mnt/cdrom 2> /dev/null
    543543mount / -o rw,remount > /dev/null 2> /dev/null
  • branches/stable/mindi/rootfs/sbin/install-additional-tools

    r866 r1193  
    4343    biggiefsize=`cat $stub.size`
    4444    rm -f $stub.name $stub.size
    45 #    echo -e -n "\rRecombining #$biggienumber ($biggiefname)        \r"
    4645    > /tmp/out.dat
    4746    sliceno=0
  • branches/stable/mondo/src/common/libmondo-archive.c

    r1186 r1193  
    1818
    1919#include "my-stuff.h"
    20 #include "../common/mondostructures.h"
     20#include "mondostructures.h"
    2121#include "mr_conf.h"
    2222#include "mr_mem.h"
     
    35063506    mr_asprintf(&tmp, "Writing the final ISO");
    35073507    mr_msg(2, tmp);
     3508    /* BERLIOS: Doesn't work on allocated chains anymore
    35083509    center_string(tmp, 80);
     3510    */
    35093511#ifndef _XWIN
    35103512    if (!g_text_mode) {
  • branches/stable/mondo/src/common/newt-specific.c

    r1184 r1193  
    129129            sync();
    130130            printf
    131                 ("---promptdialogYN---1--- %s\r\n---promptdialogYN---Q--- [yes] [no] ---\r\n--> ",
     131                ("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ",
    132132                 prompt);
    133133            mr_getline(&tmp, &n, stdin);
     
    173173        sync();
    174174        printf
    175             ("---promptdialogOKC---1--- %s\r\n---promptdialogOKC---Q--- [OK] [Cancel] ---\r\n--> ",
     175            ("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ",
    176176             prompt);
    177177        mr_getline(&tmp, &n, stdin);
     
    558558    } else {
    559559        mr_asprintf(&tmp, title);
     560        /* BERLIOS: Doesn't work on allocated chains anymore
    560561        center_string(tmp, 80);
     562        */
    561563        newtPushHelpLine(tmp);
    562564        mr_free(tmp);
    563565    }
     566    /* BERLIOS: Doesn't work on allocated chains anymore
    564567    center_string(g_isoform_header_str, 36);
     568    */
    565569    g_isoform_starttime = get_time();
    566570    if (g_text_mode) {
     
    614618    mr_asprintf(&blurb3, b3);
    615619    mr_asprintf(&b1c, b1);
     620    /* BERLIOS: Doesn't work for allocated chains anymore
    616621    center_string(b1c, 80);
     622    */
    617623    if (max_val <= 0) {
    618624        max_val = 1;
     
    665671    if (g_text_mode) {
    666672        printf
    667             ("---promptpopup---1--- %s\r\n---promptpopup---Q--- [OK] ---\r\n--> ",
     673            ("---promptpopup---1--- %s\n---promptpopup---Q--- [OK] ---\n--> ",
    668674             prompt);
    669675        while (((ch = getchar()) != '\n') && (ch != EOF));
     
    707713    if (g_text_mode) {
    708714        printf
    709             ("---promptstring---1--- %s\r\n---promptstring---2--- %s\r\n---promptstring---Q---\r\n-->  ",
     715            ("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ",
    710716             title, b);
    711717        (void) fgets(output, maxsize, stdin);
     
    732738    myForm = newtForm(NULL, NULL, 0);
    733739    newtFormAddComponents(myForm, text, type_here, b_1, b_2, NULL);
     740    /* BERLIOS: Doesn't work on allocated chains anymore
    734741    center_string(blurb, 80);
     742    */
    735743    newtPushHelpLine(blurb);
    736744    mr_free(blurb);
     
    814822    myForm = newtForm(NULL, NULL, 0);
    815823    newtFormAddComponents(myForm, text, b_1, b_2, NULL);
     824    /* BERLIOS: Doesn't work on allocated chains anymore
    816825    center_string(prompt, 80);
     826    */
    817827    newtPushHelpLine(prompt);
    818828    mr_free(prompt);
     
    968978                mr_strcat(taskprogress, tmp1);
    969979                mr_free(tmp1);
    970                 printf("---evalcall---1--- %s\r\n",
    971                        g_isoform_header_str);
    972                 printf("---evalcall---2--- %s\r\n", taskprogress);
    973                 printf("---evalcall---E---\r\n");
     980                printf("---evalcall------ %s\n", taskprogress);
    974981                mr_free(taskprogress);
    975982            }
     
    10951102        mr_free(taskprogress);
    10961103    } else {
     1104        /* BERLIOS: Doesn't work on allocated chains anymore
    10971105        center_string(blurb1, 54);
     1106        */
     1107        /* BERLIOS: Doesn't work on allocated chains anymore
    10981108        center_string(blurb2, 54);
     1109        */
     1110        /* BERLIOS: Doesn't work on allocated chains anymore
    10991111        center_string(blurb3, 54);
     1112        */
    11001113        newtLabelSetText(g_blurb1, blurb1);
    11011114        newtLabelSetText(g_blurb2, blurb3);
  • branches/stable/mondo/src/mondorestore/mondorestore.c

    r1192 r1193  
    28882888   **************************************************************************/
    28892889    if (getuid() != 0) {
    2890         fprintf(stderr, "Please run as root.\r\n");
     2890        fprintf(stderr, "Please run as root.\n");
    28912891        exit(127);
    28922892    }
  • branches/stable/mondo/src/restore-scripts/mondo/restore-bigfiles-from-iso

    r998 r1193  
    3838    cd $restorepath
    3939    for slicename in `find $MOUNTPT/archives | grep "slice-" | sort` ; do
    40 #        echo -en "Slice = $slicename    \r"
    4140        echo -en "."
    4241        if echo "$slicename" | grep "slice-[0-9]*.00000\.dat" 2> /dev/null; then
Note: See TracChangeset for help on using the changeset viewer.