diff options
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/gnunet-gns-proxy-setup-ca.in | 44 |
1 files changed, 4 insertions, 40 deletions
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/gns/gnunet-gns-proxy-setup-ca.in index 256bb882b..e3f3f4852 100644 --- a/src/gns/gnunet-gns-proxy-setup-ca.in +++ b/src/gns/gnunet-gns-proxy-setup-ca.in | |||
@@ -46,14 +46,16 @@ | |||
46 | # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY | 46 | # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY |
47 | # OF SUCH DAMAGE. | 47 | # OF SUCH DAMAGE. |
48 | 48 | ||
49 | progname=${0##*/} | 49 | . @pkgdatadir@/progname.sh |
50 | . @pkgdatadir@/existence.sh | ||
51 | . @pkgdatadir@/msg.sh | ||
52 | . @pkgdatadir@/version_gnunet.sh | ||
50 | 53 | ||
51 | # Whitespace normalization without depending on shell features: | 54 | # Whitespace normalization without depending on shell features: |
52 | tab=' ' | 55 | tab=' ' |
53 | tab2=' ' | 56 | tab2=' ' |
54 | nl=' | 57 | nl=' |
55 | ' | 58 | ' |
56 | # trap "exit 1" 1 2 3 15 | ||
57 | 59 | ||
58 | setdefaults() | 60 | setdefaults() |
59 | { | 61 | { |
@@ -64,38 +66,6 @@ setdefaults() | |||
64 | runcmd= | 66 | runcmd= |
65 | } | 67 | } |
66 | 68 | ||
67 | statusmsg() | ||
68 | { | ||
69 | ${runcmd} echo "${tab}$@" | tee -a "${results}" | ||
70 | } | ||
71 | |||
72 | infomsg() | ||
73 | { | ||
74 | if [ x$verbosity = x1 ]; then | ||
75 | statusmsg "INFO:${tab}$@" | ||
76 | fi | ||
77 | } | ||
78 | |||
79 | warningmsg() | ||
80 | { | ||
81 | statusmsg "WARNING:${tab}$@" | ||
82 | } | ||
83 | |||
84 | errormsg() | ||
85 | { | ||
86 | statusmsg "ERROR:${tab}$@" | ||
87 | } | ||
88 | |||
89 | linemsg() | ||
90 | { | ||
91 | statusmsg "=========================================" | ||
92 | } | ||
93 | |||
94 | existence() | ||
95 | { | ||
96 | command -v "$1" >/dev/null 2>&1 | ||
97 | } | ||
98 | |||
99 | usage() | 69 | usage() |
100 | { | 70 | { |
101 | if [ -n "$*" ]; then | 71 | if [ -n "$*" ]; then |
@@ -244,12 +214,6 @@ importbrowsers() | |||
244 | fi | 214 | fi |
245 | } | 215 | } |
246 | 216 | ||
247 | print_version() | ||
248 | { | ||
249 | GNUNET_ARM_VERSION=`gnunet-arm -v | awk '{print $2 " " $3}'` | ||
250 | echo ${progname} $GNUNET_ARM_VERSION | ||
251 | } | ||
252 | |||
253 | clean_up() | 217 | clean_up() |
254 | { | 218 | { |
255 | infomsg "Cleaning up." | 219 | infomsg "Cleaning up." |