Browse Source

Update with new library name

Alois Mahdal 10 years ago
parent
commit
043b382e08
12 changed files with 67 additions and 67 deletions
  1. 6
    6
      bin/ccfn.in
  2. 3
    3
      bin/eeabrt.in
  3. 6
    6
      bin/eeget.in
  4. 4
    4
      bin/eeiam.in
  5. 5
    5
      bin/eeln.in
  6. 9
    9
      bin/eemk.in
  7. 7
    7
      bin/eepush.in
  8. 12
    12
      bin/eerevert.in
  9. 6
    6
      bin/eewatch.in
  10. 4
    4
      bin/eewww.in
  11. 2
    2
      config.mk
  12. 3
    3
      setup/mk.sh

+ 6
- 6
bin/ccfn.in View File

@@ -1,9 +1,9 @@
1 1
 #!/bin/bash
2 2
 
3
-. __FFOOD_INIT__
3
+. __FFOO_INIT__
4 4
 
5
-ffood import core
6
-ffood import recon
5
+ffoo import core
6
+ffoo import recon
7 7
 
8 8
 
9 9
 usage() {
@@ -11,12 +11,12 @@ usage() {
11 11
 }
12 12
 
13 13
 includes=""
14
-FFOOD_DEBUG=false
14
+FFOO_DEBUG=false
15 15
 
16 16
 while true; do
17 17
     case $1 in
18 18
         -d|--debug)
19
-            FFOOD_DEBUG=true
19
+            FFOO_DEBUG=true
20 20
             shift 1
21 21
             ;;
22 22
         -I|--include)
@@ -37,7 +37,7 @@ while true; do
37 37
 done
38 38
 
39 39
 for i in $(tr ":" " " <<<"$includes"); do
40
-    ffood import $i
40
+    ffoo import $i
41 41
 done
42 42
 
43 43
 "$@"

+ 3
- 3
bin/eeabrt.in View File

@@ -2,9 +2,9 @@
2 2
 
3 3
 # Take a core dump and try to analyze it with ABRT
4 4
 
5
-. __FFOOD_INIT__
5
+. __FFOO_INIT__
6 6
 
7
-ffood import core
7
+ffoo import core
8 8
 
9 9
 usage() {
10 10
     usage_is "exename"
@@ -13,7 +13,7 @@ usage() {
13 13
 while true;
14 14
 do
15 15
     case $1 in
16
-        -d) FFOOD_DEBUG=true ;;
16
+        -d) FFOO_DEBUG=true ;;
17 17
         "") break ;;
18 18
         *) cmd=$1; shift; ;;
19 19
     esac

+ 6
- 6
bin/eeget.in View File

@@ -1,10 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-. __FFOOD_INIT__
4
-FFOOD_INIPATH="__FFOOD_INIPATH__"
3
+. __FFOO_INIT__
4
+FFOO_INIPATH="__FFOO_INIPATH__"
5 5
 
6
-ffood import core
7
-ffood import yummy
6
+ffoo import core
7
+ffoo import yummy
8 8
 
9 9
 usage() {
10 10
     usage_is "[-d] [-f] NVRLIST" \
@@ -16,7 +16,7 @@ while true; do case $1 in
16 16
     -f|--file)      nvrlist=$2;         shift 2; break; ;;
17 17
     -n|--nvr)       nvr=$2;             shift 2;        ;;
18 18
     -t|--to)        dest=$2;            shift 2;        ;;
19
-    -d|--debug)     FFOOD_DEBUG=true;   shift;          ;;
19
+    -d|--debug)     FFOO_DEBUG=true;   shift;          ;;
20 20
     *)              nvrlist=$1;         shift;   break  ;;
21 21
 esac done
22 22
 
@@ -40,7 +40,7 @@ get_nvr() {
40 40
     local pkgroot="$brewroot/packages/$name/$version/$release"
41 41
     rsync -u "$pkgroot/$arch/"* "$dest"
42 42
     test -f "$pkgroot/noarch/"* && rsync -u "$pkgroot/noarch/"* "$dest"
43
-    $FFOOD_VERBOSE && find $dest -type f
43
+    $FFOO_VERBOSE && find $dest -type f
44 44
 
45 45
 }
46 46
 

+ 4
- 4
bin/eeiam.in View File

@@ -1,10 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-. __FFOOD_INIT__
4
-FFOOD_INIPATH="__FFOOD_INIPATH__"
3
+. __FFOO_INIT__
4
+FFOO_INIPATH="__FFOO_INIPATH__"
5 5
 
6
-ffood import core
7
-ffood import recon
6
+ffoo import core
7
+ffoo import recon
8 8
 
9 9
 
10 10
 #

+ 5
- 5
bin/eeln.in View File

@@ -1,9 +1,9 @@
1 1
 #!/bin/bash
2 2
 
3
-. __FFOOD_INIT__
4
-FFOOD_INIPATH="__FFOOD_INIPATH__"
3
+. __FFOO_INIT__
4
+FFOO_INIPATH="__FFOO_INIPATH__"
5 5
 
6
-ffood import core
6
+ffoo import core
7 7
 
8 8
 DEFAULT_TARGET=$HOME
9 9
 TRY_RELPATH=true
@@ -53,7 +53,7 @@ while true;
53 53
 do
54 54
     case $1 in
55 55
         -d|--debug)
56
-            FFOOD_DEBUG=true
56
+            FFOO_DEBUG=true
57 57
             shift
58 58
             ;;
59 59
         -f|--force)
@@ -65,7 +65,7 @@ do
65 65
             shift 2
66 66
             ;;
67 67
         -v|--verbose)
68
-            FFOOD_VERBOSE=true
68
+            FFOO_VERBOSE=true
69 69
             shift
70 70
             ;;
71 71
         -t|--target)

+ 9
- 9
bin/eemk.in View File

@@ -1,16 +1,16 @@
1 1
 #!/bin/bash
2 2
 
3
-. __FFOOD_INIT__
4
-FFOOD_INIPATH="__FFOOD_INIPATH__"
3
+. __FFOO_INIT__
4
+FFOO_INIPATH="__FFOO_INIPATH__"
5 5
 
6
-ffood import core
7
-ffood import proj_ol
8
-ffood import testing
9
-ffood import sw
10
-ffood import yummy
6
+ffoo import core
7
+ffoo import proj_ol
8
+ffoo import testing
9
+ffoo import sw
10
+ffoo import yummy
11 11
 
12
-ENVIRON_SCRIPT="$FFOOD_DATA_DIR-local/bash_env"
13
-FFOOD_VERBOSE=true
12
+ENVIRON_SCRIPT="$FFOO_DATA_DIR-local/bash_env"
13
+FFOO_VERBOSE=true
14 14
 
15 15
 # tmp needs to be shared to children
16 16
 if test -d "$TMP_DIR";

+ 7
- 7
bin/eepush.in View File

@@ -1,19 +1,19 @@
1 1
 #!/bin/bash
2 2
 
3
-. __FFOOD_INIT__
4
-FFOOD_INIPATH="__FFOOD_INIPATH__"
3
+. __FFOO_INIT__
4
+FFOO_INIPATH="__FFOO_INIPATH__"
5 5
 
6
-ffood import core
7
-ffood import recon
6
+ffoo import core
7
+ffoo import recon
8 8
 
9 9
 ORDER="$(iniread -p push.options.order push.ini)"
10 10
 
11 11
 while true;
12 12
 do
13 13
     case $1 in
14
-        -d|--debug)     FFOOD_DEBUG=true;     shift;    ;;
15
-        -v|--verbose)   FFOOD_VERBOSE=true;   shift;    ;;
16
-        -q|--quiet)     FFOOD_VERBOSE=false;  shift;    ;;
14
+        -d|--debug)     FFOO_DEBUG=true;     shift;    ;;
15
+        -v|--verbose)   FFOO_VERBOSE=true;   shift;    ;;
16
+        -q|--quiet)     FFOO_VERBOSE=false;  shift;    ;;
17 17
         -o|--order)     ORDER=$2;             shift 2;  ;;
18 18
         -h|--help)      usage;                          ;;
19 19
         "")             break                           ;;

+ 12
- 12
bin/eerevert.in View File

@@ -1,16 +1,16 @@
1 1
 #!/bin/bash
2 2
 
3
-. __FFOOD_INIT__
4
-FFOOD_INIPATH="__FFOOD_INIPATH__"
3
+. __FFOO_INIT__
4
+FFOO_INIPATH="__FFOO_INIPATH__"
5 5
 
6
-ffood import core
7
-ffood import recon
6
+ffoo import core
7
+ffoo import recon
8 8
 
9 9
 usage() {
10 10
     usage_is "[-d|--debug] [-v|--verbose] [--dry-run] [-c|--connection] domain [snapshot]"
11 11
 }
12 12
 
13
-FFOOD_DRY_RUN=false
13
+FFOO_DRY_RUN=false
14 14
 connection="qemu:///system"
15 15
 
16 16
 while true; do
@@ -20,19 +20,19 @@ while true; do
20 20
             shift 2
21 21
             ;;
22 22
         -d|--debug)
23
-            FFOOD_DEBUG=true
23
+            FFOO_DEBUG=true
24 24
             shift 1
25 25
             ;;
26 26
         -q|--quiet)
27
-            FFOOD_VERBOSE=false
27
+            FFOO_VERBOSE=false
28 28
             shift 1
29 29
             ;;
30 30
         -v|--verbose)
31
-            FFOOD_VERBOSE=true
31
+            FFOO_VERBOSE=true
32 32
             shift 1
33 33
             ;;
34 34
         --dry-run)
35
-            FFOOD_DRY_RUN=true
35
+            FFOO_DRY_RUN=true
36 36
             shift 1
37 37
             ;;
38 38
         "")
@@ -51,7 +51,7 @@ done
51 51
 domain="$1"
52 52
 snapshot="$2"
53 53
 
54
-FFOOD_DATA_DIR=/home/amahdal/.eecc
54
+FFOO_DATA_DIR=/home/amahdal/.eecc
55 55
 
56 56
 test -z "$snapshot" && {
57 57
     think "looking for $domain in revert.ini"
@@ -67,8 +67,8 @@ test -z "$snapshot" && {
67 67
 
68 68
 think "reverting $domain to $snapshot"
69 69
 debug "virsh -c "$connection" snapshot-revert $domain $snapshot"
70
-$FFOOD_DRY_RUN || virsh -c "$connection" snapshot-revert $domain $snapshot
70
+$FFOO_DRY_RUN || virsh -c "$connection" snapshot-revert $domain $snapshot
71 71
 
72 72
 think "starting $domain"
73 73
 debug "virsh -c "$connection" start $domain"
74
-$FFOOD_DRY_RUN || virsh -c "$connection" start $domain
74
+$FFOO_DRY_RUN || virsh -c "$connection" start $domain

+ 6
- 6
bin/eewatch.in View File

@@ -1,12 +1,12 @@
1 1
 #!/bin/bash
2 2
 
3
-. __FFOOD_INIT__
4
-FFOOD_INIPATH="__FFOOD_INIPATH__"
3
+. __FFOO_INIT__
4
+FFOO_INIPATH="__FFOO_INIPATH__"
5 5
 
6
-ffood import core
7
-ffood import recon
6
+ffoo import core
7
+ffoo import recon
8 8
 
9
-FFOOD_DEBUG=false
9
+FFOO_DEBUG=false
10 10
 
11 11
 interval=2
12 12
 
@@ -45,7 +45,7 @@ do
45 45
             shift 2
46 46
             ;;
47 47
         -d|--debug)
48
-            FFOOD_DEBUG=true
48
+            FFOO_DEBUG=true
49 49
             shift 1
50 50
             ;;
51 51
         -r|--regexes)

+ 4
- 4
bin/eewww.in View File

@@ -1,10 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-. __FFOOD_INIT__
4
-FFOOD_INIPATH="__FFOOD_INIPATH__"
3
+. __FFOO_INIT__
4
+FFOO_INIPATH="__FFOO_INIPATH__"
5 5
 
6
-ffood import www
7
-ffood import xorg
6
+ffoo import www
7
+ffoo import xorg
8 8
 
9 9
 test -z "$uri" && uri="$(echo "$*" | find_uri)"
10 10
 test -z "$uri" && uri="$(clipln | find_uri)"

+ 2
- 2
config.mk View File

@@ -2,5 +2,5 @@
2 2
 VERSION = 0.0.0
3 3
 PREFIX = /usr/local
4 4
 MANPREFIX = ${PREFIX}/share/man
5
-FFOOD_INIPATH_GLOBAL = /etc/eecc
6
-FFOOD_INIPATH_USER = .eecc
5
+FFOO_INIPATH_GLOBAL = /etc/eecc
6
+FFOO_INIPATH_USER = .eecc

+ 3
- 3
setup/mk.sh View File

@@ -69,14 +69,14 @@ eecc() {
69 69
                "In the latter case try running (only) \`make\` under normal" \
70 70
                "user and repeating the \`make install\` again." \
71 71
                "-----"
72
-    local ffood_init=$(ffmanage --library-init)
72
+    local ffoo_init=$(ffmanage --library-init)
73 73
     local srcpath dstpath
74 74
     find -type f -name '*.in' \
75 75
         | while read srcpath;
76 76
           do
77 77
               dstpath=${srcpath%.in}
78
-              perl -pe "s|__FFOOD_INIT__|$ffood_init|;
79
-                        s|__FFOOD_INIPATH__|$FFOOD_INIPATH_GLOBAL:\\\$HOME/$FFOOD_INIPATH_USER|;
78
+              perl -pe "s|__FFOO_INIT__|$ffoo_init|;
79
+                        s|__FFOO_INIPATH__|$FFOO_INIPATH_GLOBAL:\\\$HOME/$FFOO_INIPATH_USER|;
80 80
                         s|__VERSION__|$VERSION|;" < $srcpath > $dstpath
81 81
               echo $dstpath >> built.list
82 82
           done