Ver código fonte

Hide color variables in _pretty_color.sh

These were never intended to be used outside _pretty_color; the fact
that _pretty_color is internal does not mean *its* internal globals do
not need to follow underscore rules.
Alois Mahdal 7 anos atrás
pai
commit
2ebb3eeb00

+ 23
- 23
src/include-bash/_pretty_color.sh Ver arquivo

@@ -3,22 +3,22 @@
3 3
 shellfu import termcolors
4 4
 
5 5
 
6
-PRETTY_COLOR_DEBUG=""
7
-PRETTY_COLOR_DIE=""
8
-PRETTY_COLOR_USAGE_IS=""
9
-PRETTY_COLOR_THINK=""
10
-PRETTY_COLOR_WARN=""
11
-PRETTY_COLOR_OFF=""
6
+_PRETTY_COLOR_DEBUG=""
7
+_PRETTY_COLOR_DIE=""
8
+_PRETTY_COLOR_USAGE_IS=""
9
+_PRETTY_COLOR_THINK=""
10
+_PRETTY_COLOR_WARN=""
11
+_PRETTY_COLOR_OFF=""
12 12
 
13 13
 
14 14
 __shellfu__pretty_color__init() {
15 15
     test -t 2 || return 0   # stderr is a pipe/file; refrain from colors
16
-    PRETTY_COLOR_DEBUG="${TERMCOLORS_LBLUE}"
17
-    PRETTY_COLOR_DIE="${TERMCOLORS_LRED}"
18
-    PRETTY_COLOR_USAGE_IS="${TERMCOLORS_YELLOW}"
19
-    PRETTY_COLOR_THINK="${TERMCOLORS_LBLACK}"
20
-    PRETTY_COLOR_WARN="${TERMCOLORS_LRED}"
21
-    PRETTY_COLOR_OFF="${TERMCOLORS_NONE}"
16
+    _PRETTY_COLOR_DEBUG="${TERMCOLORS_LBLUE}"
17
+    _PRETTY_COLOR_DIE="${TERMCOLORS_LRED}"
18
+    _PRETTY_COLOR_USAGE_IS="${TERMCOLORS_YELLOW}"
19
+    _PRETTY_COLOR_THINK="${TERMCOLORS_LBLACK}"
20
+    _PRETTY_COLOR_WARN="${TERMCOLORS_LRED}"
21
+    _PRETTY_COLOR_OFF="${TERMCOLORS_NONE}"
22 22
 }
23 23
 
24 24
 
@@ -26,46 +26,46 @@ _pretty__debug() {
26 26
     local decor="()"
27 27
     $caller_is_main && decor=
28 28
     while IFS= read -r line;
29
-    do echo -ne "${PRETTY_COLOR_DEBUG}debug:$caller$decor:$PRETTY_COLOR_OFF"
29
+    do echo -ne "${_PRETTY_COLOR_DEBUG}debug:$caller$decor:$_PRETTY_COLOR_OFF"
30 30
        echo "$line"; done
31 31
 }
32 32
 
33 33
 
34 34
 _pretty__die() {
35
-    echo -ne "$PRETTY_COLOR_DIE"
35
+    echo -ne "$_PRETTY_COLOR_DIE"
36 36
     while IFS= read -r line;
37 37
     do echo "$line"; done
38
-    echo -ne "$PRETTY_COLOR_OFF"
38
+    echo -ne "$_PRETTY_COLOR_OFF"
39 39
 }
40 40
 
41 41
 
42 42
 _pretty__mkhelp() {
43
-    echo -ne "$PRETTY_COLOR_USAGE_IS"
43
+    echo -ne "$_PRETTY_COLOR_USAGE_IS"
44 44
     while IFS= read -r line;
45 45
     do echo -e "$line"; done
46
-    echo -ne "$PRETTY_COLOR_OFF"
46
+    echo -ne "$_PRETTY_COLOR_OFF"
47 47
 }
48 48
 
49 49
 
50 50
 _pretty__mkusage() {
51
-    echo -ne "$PRETTY_COLOR_USAGE_IS"
51
+    echo -ne "$_PRETTY_COLOR_USAGE_IS"
52 52
     while IFS= read -r line;
53 53
     do echo -e "$line"; done
54
-    echo -ne "$PRETTY_COLOR_OFF"
54
+    echo -ne "$_PRETTY_COLOR_OFF"
55 55
 }
56 56
 
57 57
 
58 58
 _pretty__think() {
59
-    echo -ne "$PRETTY_COLOR_THINK"
59
+    echo -ne "$_PRETTY_COLOR_THINK"
60 60
     while IFS= read -r line;
61 61
     do echo "$line"; done
62
-    echo -ne "$PRETTY_COLOR_OFF"
62
+    echo -ne "$_PRETTY_COLOR_OFF"
63 63
 }
64 64
 
65 65
 
66 66
 _pretty__warn() {
67
-    echo -ne "$PRETTY_COLOR_WARN"
67
+    echo -ne "$_PRETTY_COLOR_WARN"
68 68
     while IFS= read -r line;
69 69
     do echo "$line"; done
70
-    echo -ne "$PRETTY_COLOR_OFF"
70
+    echo -ne "$_PRETTY_COLOR_OFF"
71 71
 }

+ 6
- 6
tests/shellfu_api/oracle/variables.stdout Ver arquivo

@@ -1,9 +1,9 @@
1
-_pretty_color.PRETTY_COLOR_DEBUG
2
-_pretty_color.PRETTY_COLOR_DIE
3
-_pretty_color.PRETTY_COLOR_OFF
4
-_pretty_color.PRETTY_COLOR_THINK
5
-_pretty_color.PRETTY_COLOR_USAGE_IS
6
-_pretty_color.PRETTY_COLOR_WARN
1
+_pretty_color._PRETTY_COLOR_DEBUG
2
+_pretty_color._PRETTY_COLOR_DIE
3
+_pretty_color._PRETTY_COLOR_OFF
4
+_pretty_color._PRETTY_COLOR_THINK
5
+_pretty_color._PRETTY_COLOR_USAGE_IS
6
+_pretty_color._PRETTY_COLOR_WARN
7 7
 charmenu.CHARMENU_FILE
8 8
 exit.EXIT_ERROR
9 9
 exit.EXIT_NO