Changeset 273 in MondoRescue for branches/2.06/mondo/mondo/common/libmondo-tools.c

Timestamp:

Jan 3, 2006, 4:09:12 PM (18 years ago)

Author:

bcornec

Message:

Patches from Sébastien Aperghis-Tramoni <maddingue@…>

replace several occurences of "cat .. | grep .."
or with similar commands that accept filenames as arguments.
+ some sort | uniq replaced by sort -u

File:

• branches/2.06/mondo/mondo/common/libmondo-tools.c (modified) (3 diffs)

branches/2.06/mondo/mondo/common/libmondo-tools.c

@@ -335 +335 @@
            "for i in `find /root /home -type d -name Desktop -maxdepth 2`; do \
 file=$i/.directory; if [ -f \"$file\" ] ; then mv -f $file $file.old ; \
-cat $file.old | awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } \
-else { print $0;};}' > $file ; fi ; done");
+awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } \
+else { print $0;};}'$file.old  > $file ; fi ; done");
     run_program_and_log_output(tmp, 5);
     paranoid_free(tmp);
@@ -1098 +1098 @@
 #ifndef __FreeBSD__
     if (run_program_and_log_output
-        ("cat /proc/devices | grep ramdisk", FALSE)) {
+        ("grep ramdisk /proc/devices", FALSE)) {
         if (!ask_me_yes_or_no
             ("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?"))
@@ -1390 +1390 @@
     log_msg(4, "Done. Great. Seeting command to something");
     strcpy(command,
-           "cat /etc/fstab | grep -v \":\" | grep -vx \"#.*\" | grep -w \"/boot\" | tr -s ' ' '\t' | cut -f1 | head -n1");
+           "grep -v \":\" /etc/fstab | grep -vx \"#.*\" | grep -w \"/boot\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. Command = '%s'", command);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));