change all instances of .net to .com. update discovery server address in skywire startup scripts.

2 files changed, 30 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b64b30abec1..8289006ca48a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire-mainnet
-	pkgdesc = Skywire: Building a New Internet. Skycoin.net
+	pkgdesc = Skywire: Building a New Internet. Skycoin.com
 	pkgver = autogenerated
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/skycoin/skywire
 	arch = any
 	makedepends = dep
diff --git a/PKGBUILD b/PKGBUILD
index 475cd03027c5..ff34733daa8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
 projectname=skycoin
 pkgname=skywire-mainnet
 pkgname1=skywire
-pkgdesc="Skywire: Building a New Internet. Skycoin.net"
+pkgdesc="Skywire: Building a New Internet. Skycoin.com"
 pkgver='autogenerated'
-pkggopath="github.com/$projectname/$pkgname1"
-pkgrel=2
+pkggopath="github.com/${projectname}/${pkgname1}"
+pkgrel=3
 arch=('any')
 url="https://${pkggopath}"
 license=()
@@ -17,7 +17,7 @@ source=("git+${url}.git#branch=${BRANCH:-mainnet}")
 sha256sums=('SKIP')
 
 export GOOS=linux
-export GOPATH="$srcdir"
+export GOPATH="${srcdir}"
 export GOROOT="$builddir"
 export GOBIN="$GOROOT"/bin
 export GOROOT_FINAL=/usr/lib/go
@@ -41,22 +41,22 @@ mipsel)   export GOARCH="mipsle" ;;
 	esac
 
 pkgver() {
-	cd "$srcdir/$pkgname1"
+	cd "${srcdir}/${pkgname1}"
 	local date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
 	local count=$(git rev-list --count HEAD)
 	local commit=$(git rev-parse --short HEAD)
-	echo "$date.${count}_$commit"
+	echo "${date}.${count}_${commit}"
 }
 
 prepare() {
   # https://wiki.archlinux.org/index.php/Go_package_guidelines
-  mkdir -p $srcdir/go/src/${pkggopath//$pkgname1/} "$srcdir"/go/bin
-  ln -rTsf $srcdir/$pkgname1 $srcdir/go/src/$pkggopath
-  cd $srcdir/go/src/$pkggopath/
+  mkdir -p ${srcdir}/go/src/${pkggopath//${pkgname1}/} "${srcdir}"/go/bin
+  ln -rTsf ${srcdir}/${pkgname1} ${srcdir}/go/src/${pkggopath}
+  cd ${srcdir}/go/src/${pkggopath}/
   git checkout mainnet
   git submodule --quiet update --init --recursive
 
-  export GOPATH="$srcdir"/go
+  export GOPATH="${srcdir}"/go
   export GOBIN=${GOPATH}/bin
   export PATH=${GOPATH}/bin:${PATH}
   msg2 'installing go dependencies'
@@ -65,38 +65,38 @@ prepare() {
 }
 
 build() {
-  export GOPATH=$srcdir/go
+  export GOPATH=${srcdir}/go
   export GOBIN=${GOPATH}/bin
   export PATH=${GOPATH}/bin:${PATH}
-  cd $srcdir/go/src/$pkggopath
+  cd ${srcdir}/go/src/${pkggopath}
   make build
   make install
-	mv messaging-server $srcdir/go/bin/messaging-server
+	mv messaging-server ${srcdir}/go/bin/messaging-server
   #user must generate default json config by running this script after install
 	msg 2 'creating setup script; please run skywire-seup after installation'
-  echo -e '#!/bin/bash \n # this script sets up skywire after installation \n mkdir -p ~/skywire \n sudo chmod 777 ~/skywire \n sudo chmod 777 ~/apps \n cd ~/ \n ln -s /usr/lib/skycoin/skywire/apps ~/ \n skywire-cli node gen-config -r \n skywire-manager-node gen-config -r \n skywire-manager-node \n #skywire-node skywire-config.json' > $srcdir/go/bin/$pkgname1-setup
-  chmod +x $srcdir/go/bin/$pkgname1-setup
+  echo -e '#!/bin/bash \n # this script sets up skywire after installation \n mkdir -p ~/skywire \n sudo chmod 777 ~/skywire \n sudo chmod 777 ~/apps \n cd ~/ \n ln -s /usr/lib/skycoin/skywire/apps ~/ \n skywire-cli node gen-config -r \n skywire-manager-node gen-config -r \n skywire-manager-node \n #skywire-node skywire-config.json' > ${srcdir}/go/bin/${pkgname1}-setup
+  chmod +x ${srcdir}/go/bin/${pkgname1}-setup
 }
 
 package() {
     options=(!strip staticlibs)
   #create directory trees
-  mkdir -p $pkgdir/usr/bin
-  mkdir -p $pkgdir/usr/lib/$projectname/go/bin
-  mkdir -p $pkgdir/usr/lib/$projectname/$pkgname1/
+  mkdir -p ${pkgdir}/usr/bin
+  mkdir -p ${pkgdir}/usr/lib/${projectname}/go/bin
+  mkdir -p ${pkgdir}/usr/lib/${projectname}/${pkgname1}/
   #restate go envs
-  export GOPATH=$pkgdir/usr/lib/$projectname/go
-  export GOBIN=$pkgdir/usr/lib/$projectname/go/bin
+  export GOPATH=${pkgdir}/usr/lib/${projectname}/go
+  export GOBIN=${pkgdir}/usr/lib/${projectname}/go/bin
 	#NOT putting the sources in /usr/lib/skycoin/skywire for size considerations
-	#cp -r $srcdir/$pkgname1/ $pkgdir/usr/lib/$projectname/
+	#cp -r ${srcdir}/${pkgname1}/ ${pkgdir}/usr/lib/${projectname}/
   msg2 'installing binaries'
-  skybins="$srcdir"/go/bin
-  #ln -rTsf $skybins/manager-node $skybins/$pkgname1-manager-node
-  skywirebins=$( ls $skybins )
-  for i in $skywirebins; do
-    install -Dm755 $srcdir/go/bin/$i $pkgdir/usr/lib/$projectname/go/bin/$i
-    ln -rTsf $pkgdir/usr/lib/$projectname/go/bin/$i $pkgdir/usr/bin/$i
-    chmod 755 $pkgdir/usr/bin/$i
+  skybins="${srcdir}"/go/bin
+  #ln -rTsf ${skybins}/manager-node ${skybins}/${pkgname1}-manager-node
+  skywirebins=$( ls ${skybins} )
+  for i in ${skywirebins}; do
+    install -Dm755 ${srcdir}/go/bin/${i} ${pkgdir}/usr/lib/${projectname}/go/bin/${i}
+    ln -rTsf ${pkgdir}/usr/lib/${projectname}/go/bin/${i} ${pkgdir}/usr/bin/${i}
+    chmod 755 ${pkgdir}/usr/bin/${i}
   done
   msg2 'please run skywire-setup after installing this package'
 }