gnunet-gns-proxy-setup-ca: use shlib

diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/gns/gnunet-gns-proxy-setup-ca.in
index 256bb882b24c1502ac228a41ff268b782a4f1664..e3f3f485297214b5883460d2c453c73bc5a535df 100644 (file)
--- a/src/gns/gnunet-gns-proxy-setup-ca.in
+++ b/src/gns/gnunet-gns-proxy-setup-ca.in
@@ -46,14 +46,16 @@
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 # OF SUCH DAMAGE.
 
-progname=${0##*/}
+. @pkgdatadir@/progname.sh
+. @pkgdatadir@/existence.sh
+. @pkgdatadir@/msg.sh
+. @pkgdatadir@/version_gnunet.sh
 
 # Whitespace normalization without depending on shell features:
 tab='   '
 tab2='   '
 nl='
 '
-# trap "exit 1" 1 2 3 15
 
 setdefaults()
 {
@@ -64,38 +66,6 @@ setdefaults()
     runcmd=
 }
 
-statusmsg()
-{
-    ${runcmd} echo "${tab}$@" | tee -a "${results}"
-}
-
-infomsg()
-{
-    if [ x$verbosity = x1 ]; then
-        statusmsg "INFO:${tab}$@"
-    fi
-}
-
-warningmsg()
-{
-    statusmsg "WARNING:${tab}$@"
-}
-
-errormsg()
-{
-    statusmsg "ERROR:${tab}$@"
-}
-
-linemsg()
-{
-    statusmsg "========================================="
-}
-
-existence()
-{
-    command -v "$1" >/dev/null 2>&1
-}
-
 usage()
 {
     if [ -n "$*" ]; then
@@ -244,12 +214,6 @@ importbrowsers()
     fi
 }
 
-print_version()
-{
-    GNUNET_ARM_VERSION=`gnunet-arm -v | awk '{print $2 " " $3}'`
-    echo ${progname} $GNUNET_ARM_VERSION
-}
-
 clean_up()
 {
     infomsg "Cleaning up."