diff options
| -rw-r--r-- | control (renamed from debian/control) | 0 | ||||
| -rw-r--r-- | debian/Makefile | 49 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rwxr-xr-x | debian/postinst | 1 | ||||
| -rw-r--r-- | digStatusWindow.go | 8 | ||||
| -rw-r--r-- | resources/empty.so | 0 |
6 files changed, 4 insertions, 55 deletions
diff --git a/debian/Makefile b/debian/Makefile deleted file mode 100644 index 1b42b3b..0000000 --- a/debian/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# GITVERSION=$(shell git rev-parse FETCH_HEAD) -VERSION=$(shell git describe --tags $(git rev-list --tags --max-count=1) | sed 's/^v//') - -BASENAME=control-panel-dns - -all: help deb - -help: - @echo - @echo "make deb # attempt to build the .deb package using dpkg" - @echo - -deb: clean extract DEBIAN build - -clean: - rm -rf ../files - rm -f ../*.deb - rm -f ../*.tar.xz data.tar.xz - rm -rf DEBIAN - -extract: - mkdir -p ../files/usr/bin - mkdir -p ../files/usr/lib/control-panel-dns/ - cp ../README.md ../files/usr/lib/control-panel-dns/ - cp ~/go/bin/control-panel-dns ../files/usr/bin/ - -# makes the DEBIAN/ directory -DEBIAN: - mkdir -p DEBIAN - - # make the md5sum file - cd ../files/ && find -type f -exec md5sum '{}' \; |sort -k2 >../md5sums - mv ../md5sums DEBIAN/ - - # make the control there - mkdir -p DEBIAN - cp control DEBIAN/ - echo Version: ${VERSION} >>DEBIAN/control - - cp postinst DEBIAN - -build: - mv DEBIAN ../files/ - cd .. && dpkg-deb --build files ${BASENAME}_${VERSION}_amd64.deb - @echo - @echo '#######################' - cd .. && dpkg-deb --info ${BASENAME}_${VERSION}_amd64.deb - @echo '#######################' - @echo diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/postinst b/debian/postinst deleted file mode 100755 index 1a24852..0000000 --- a/debian/postinst +++ /dev/null @@ -1 +0,0 @@ -#!/bin/sh diff --git a/digStatusWindow.go b/digStatusWindow.go index 5722f47..dce5b71 100644 --- a/digStatusWindow.go +++ b/digStatusWindow.go @@ -253,12 +253,12 @@ func (ds *digStatus) updateDnsStatus() { } cmd = "dig +noall +answer www.wit.com A" - out = shell.Run(cmd) + out = shell.RunCapture(cmd) log.Log(DNS, "makeDnsStatusGrid() dig", out) me.digStatus.set(ds.DnsDigUDP, out) cmd = "dig +noall +answer www.wit.com AAAA" - out = shell.Run(cmd) + out = shell.RunCapture(cmd) log.Log(DNS, "makeDnsStatusGrid() dig", out) me.digStatus.set(ds.DnsDigTCP, out) @@ -290,14 +290,14 @@ func (ds *digStatus) makeDnsStatusGrid() { cmd = "dig +noall +answer go.wit.com A" grid.NewLabel(cmd) ds.DnsDigUDP = grid.NewLabel("?") - out = shell.Run(cmd) + out = shell.RunCapture(cmd) log.Log(DNS, "makeDnsStatusGrid() dig", out) me.digStatus.set(ds.DnsDigUDP, out) cmd = "dig +noall +answer go.wit.com AAAA" grid.NewLabel(cmd) ds.DnsDigTCP = grid.NewLabel("?") - out = shell.Run(cmd) + out = shell.RunCapture(cmd) log.Log(DNS, "makeDnsStatusGrid() dig", out) me.digStatus.set(ds.DnsDigTCP, out) diff --git a/resources/empty.so b/resources/empty.so deleted file mode 100644 index e69de29..0000000 --- a/resources/empty.so +++ /dev/null |