File: 003_improved_quoting.diff

package info (click to toggle)
lessdisks 0.5.3cvs.20040906-16
  • links: PTS
  • area: main
  • in suites: sarge
  • size: 1,480 kB
  • ctags: 271
  • sloc: sh: 3,058; makefile: 92
file content (105 lines) | stat: -rw-r--r-- 3,776 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
--- lessdisks-0.5.3cvs.20040906.orig/base/init.d-scripts/lessdisks
+++ lessdisks-0.5.3cvs.20040906/base/init.d-scripts/lessdisks
@@ -33,8 +33,8 @@
     echo "mounting tmpfs on $rw"
     ;;
   translucency) ;;
-  *)echo "no valid filesystem was found to mount on!"
-    echo "this will cause big problems!"
+  *)echo 'no valid filesystem was found to mount on!'
+    echo 'this will cause big problems!'
     echo " "
     echo "edit /etc/lessdisks/server.config"
     echo "to include a valid value for rwfilesystem"
@@ -181,7 +199,7 @@
   echo "$disk_server_ip disk $disk_server" >> $rw/etc/hosts
   echo "disk_server_ip=$disk_server_ip" >> $rw/etc/config
 else
-  echo "WARNING: no ip address found for disk server!"
+  echo 'WARNING: no ip address found for disk server!'
 fi
 
 # add entries from hosts.static
--- lessdisks-0.5.3cvs.20040906.orig/cloner/usr-bin/lessdisks-cloner
+++ lessdisks-0.5.3cvs.20040906/cloner/usr-bin/lessdisks-cloner
@@ -104,7 +104,7 @@
 if [ -r "$modelconfig" ]; then
   . $modelconfig
 else
-  echo "model configuration file, $modelconfig, not found!"
+  echo "model configuration file, $modelconfig,"' not found!'
   echo "using default values from /etc/lessdisks/cloner.config" 
 fi
 
@@ -133,7 +133,7 @@
     echo "NOTE: partitioning disks may destroy any and all"
     echo "data, files, Operating Systems, and other information"
     echo "on this computer. BACK UP any important data on"
-    echo "the computer before proceeding!"
+    echo 'the computer before proceeding!'
     echo
     echo "attempt to automatically partition disks? (Y/n/quit)"
     echo
@@ -153,7 +153,7 @@
       fi
     done
     if [ -z "$schemefile" ]; then
-        echo "WARNING: no disk scheme file found! autopartitioning likely to fail"
+        echo 'WARNING: no disk scheme file found! autopartitioning likely to fail'
         echo "WARNING: please configure $clonepath/$model/etc/lessdisks-cloner/diskschemes"
         echo "WARNING: or /etc/lessdisks/diskschemes"
     fi
@@ -218,7 +218,7 @@
 
   # give a big fat warning if no swap partitions are found...
   if [ "" = "$swapdevices" ]; then
-    echo "No swap devices found! this might be a problem"
+    echo 'No swap devices found! this might be a problem'
   fi
   # make swap partitions, and we may as well use em...
   for device in $swapdevices; do
@@ -239,7 +239,7 @@
   done
 
   if [ "" = "$fsdevices" ]; then
-    echo "No Linux partitions found! exiting...."
+    echo 'ERROR: No Linux partitions found! exiting....'
     exit 1
   fi
 
@@ -247,7 +247,7 @@
   for device in $fsdevices; do
     fstype=`egrep ^$device $fstab | awk '{print $3}' | cut -d "," -f 1`
     if [ "" = "$fstype" ]; then
-      echo "warning! fstab format incorrect, or no entry for $device"
+      echo 'WARNING: fstab format incorrect, or no entry for '"$device"
     else
       if [ "" = "$(egrep $fstype /proc/filesystems)" ]; then
         modprobe $fstype
@@ -449,7 +449,7 @@
   tarball|tar) installTarBall ;;
   rsync-local|rsync-nfs) installRsyncLocal ;;
   copy|cp-local) installCopy ;;
-  "") echo "no method defined! exiting..."
+  "") echo 'ERROR: no method defined! exiting...'
     exit 1 ;;
   *) echo "method $installmethod not yet implemented. sorry. exiting..."
     exit 1 ;;
@@ -527,6 +527,6 @@
   echo -e "umounted all filesystems successfully...\a"
   sleep 1
 fi
-echo -e "finished!\a"
+echo -e 'finished!'"\a"
 sleep 1
 echo -e "\a"
--- lessdisks-0.5.3cvs.20040906.orig/base/usr-lib-lessdisks/lessdisks-terminal-install
+++ lessdisks-0.5.3cvs.20040906/base/usr-lib-lessdisks/lessdisks-terminal-install
@@ -72,4 +75,6 @@
   /usr/sbin/update-lessdisks-kernels
 fi
 
-echo "lessdisks terminal-install done!"
+echo 'lessdisks terminal-install done!'
+echo "hit enter to continue"
+read pause