implement autoincrementation of pkgrel via updates.sh (maintainer script) ; create custom dmsghttp path in PKGBUILD at /opt/skywire/local/custom

4 files changed, 24 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9310a422da09..b73d8aa8db4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire-bin
 	pkgdesc = Skywire: Building a new Internet. Skycoin.com
 	pkgver = 1.3.6
-	pkgrel = 6
+	pkgrel = 7
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index c7ab79549350..38e785af3727 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname=${pkgname/-bin/}
 _githuborg=skycoin
 pkgdesc="Skywire: Building a new Internet. Skycoin.com"
 pkgver='1.3.6'
-pkgrel=6
+pkgrel='7'
 _rc=''
 #_rc='-pr1'
 _pkgver="${pkgver}${_rc}"
@@ -79,7 +79,7 @@ _msg2 'creating dirs'
 mkdir -p "${_pkgdir}/usr/bin"
 mkdir -p "${_pkgdir}/${_dir}/bin"
 mkdir -p "${_pkgdir}/${_dir}/apps"
-mkdir -p "${_pkgdir}/${_dir}/local"
+mkdir -p "${_pkgdir}/${_dir}/local/custom"
 mkdir -p "${_pkgdir}/${_dir}/scripts"
 mkdir -p "${_pkgdir}/${_systemddir}"
 _msg2 'installing binaries'
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index 161d52fa6e58..86e858d7e395 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -23,7 +23,7 @@ noextract=(
 "${_binarchive}-amd64.tar.gz"
 "${_binarchive}-arm64.tar.gz"
 "${_binarchive}-armhf.tar.gz"
-"${_release_url}-arm.tar.gz"
+"${_binarchive}-arm.tar.gz"
 )
 sha256sums=('21775a1917f7fabea78d2b631a70c6989b910ee191b822c65fb6f290458dbced'
             '40c80ccce9e89ae559050b943be1f09d905476c614a72d74fac2a58c821ac058'
@@ -42,15 +42,20 @@ sha256sums=('21775a1917f7fabea78d2b631a70c6989b910ee191b822c65fb6f290458dbced'
 
 build() {
   _msg2 'creating the DEBIAN/control files'
-  for i in ${_pkgarches[@]}; do
-    _msg2 "_pkgarch=$i"
-    local _pkgarch=$i
+  for _i in ${_pkgarches[@]}; do
+    [[ ${_i} == "armel" ]] && continue
+    _msg2 "_pkgarch=${_i}"
+    local _pkgarch=${_i}
     #create control file for the debian package
     echo "Package: ${pkgname}" > ${srcdir}/${_pkgarch}.control
     echo "Version: ${pkgver}-${_pkgrel}" >> ${srcdir}/${_pkgarch}.control
     echo "Priority: optional" >> ${srcdir}/${_pkgarch}.control
     echo "Section: web" >> ${srcdir}/${_pkgarch}.control
-    echo "Architecture: ${_pkgarch}" >> ${srcdir}/${_pkgarch}.control
+    if [[ ${_pkgarch} == "armhf" ]] ; then
+      echo "Architecture: armhf, armel" >> ${srcdir}/${_pkgarch}.control
+    else
+      echo "Architecture: ${_pkgarch}" >> ${srcdir}/${_pkgarch}.control
+    fi
     echo "Depends: ${_debdeps}" >> ${srcdir}/${_pkgarch}.control
     echo "Provides: ${_pkgname}" >> ${srcdir}/${_pkgarch}.control
     echo "Maintainer: ${_githuborg}" >> ${srcdir}/${_pkgarch}.control
@@ -61,6 +66,8 @@ build() {
 package() {
 
 for _i in "${_pkgarches[@]}"; do
+  [[ ${_i} == "armel" ]] && continue
+
 _msg2 "_pkgarch=${_i}"
 local _pkgarch="${_i}"
 local _pkgarch1="${_pkgarch}"
@@ -90,7 +97,6 @@ _package
 
 _msg2 'installing control file and install scripts'
 install -Dm755 "${srcdir}/${_pkgarch}.control" "${_pkgdir}/DEBIAN/control"
-#_debscripts
 #install -Dm755 ${srcdir}/${_scripts}/preinst.sh ${_pkgdir}/DEBIAN/preinst
 install -Dm755 "${srcdir}/postinst.sh" "${_pkgdir}/DEBIAN/postinst"
 install -Dm755 "${srcdir}/prerm.sh" "${_pkgdir}/DEBIAN/prerm"
@@ -105,32 +111,3 @@ done
 #exit so the arch package doesn't get built
 exit
 }
-
-_descripts() {
-  func=$1
-  input_file=$2
-  # Check if the function is defined in the .install file
-  if grep -q "^$func()" "${install}"; then
-    # Create the script
-    case "$func" in
-      pre_install)  _script="preinst";;
-      post_install) _script="postinst";;
-      pre_upgrade)  _script="preinst";;
-      post_upgrade) _script="postinst";;
-      pre_remove)   _script="prerm";;
-      post_remove)  _script="postrm";;
-      backup)       _script="preinst";;
-      restore)      _script="postinst";;
-      clean)        _script="postrm";;
-      check)        _script="preinst";;
-      fix_install)  _script="postinst";;
-      fix_upgrade)  _script="postinst";;
-      *)            echo "Unknown function: $func"; continue;;
-    esac
-    _debscript="${_script}.sh"
-    echo "#!/bin/sh" > "${_pkgdir}/DEBIAN/${_debscript}"
-    echo "$(grep -A999 "^$func()" "${_pkgdir}/DEBIAN/${_debscript}" | sed '/^}$/Q')" >> "${_pkgdir}/DEBIAN/${_debscript}"
-    chmod +x "${_pkgdir}/DEBIAN/${_debscript}"
-    _msg3 "Created ${_debscript}"
-  fi
-}
diff --git a/updates.sh b/updates.sh
index f55f00ec6e3f..db8ecf632710 100755
--- a/updates.sh
+++ b/updates.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 _version=$(git ls-remote --tags --refs --sort="version:refname" https://github.com/skycoin/skywire.git | tail -n1)
 _version=${_version##*/}
 _version=${_version%%-*}
@@ -17,17 +16,19 @@ _version=${_version//v/}
 #if [[ $_vrc != "" ]]; then
 #	_vrc="-${_vrc##*-}"
 #fi
-echo "remote version="${_version}
-if [[ ${_vrc} != "" ]]; then
-echo "remote version="${_vrc}
-fi
-echo "updating checksums and version for PKGBUILD"
-sed -i "s/^pkgver=.*/pkgver='${_version}'/" PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" PKGBUILD && updpkgsums
+source PKGBUILD
+_prel="$(curl -s https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=${pkgname} | grep pkgrel | cut -d "=" -f2)"
+_prelnew=$_prel
+let _prelnew++
+echo "setting pkgver=$_version, pkgrel=${_prelnew} for PKGBUILD"
+sed -i "s/^pkgver=.*/pkgver='${_version}'/" PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" PKGBUILD && sed -i "s/^pkgrel=.*/pkgrel='${_prelnew}'/" PKGBUILD
+echo "updating checksums for PKGBUILD(s)"
+updpkgsums
 find *.PKGBUILD | parallel unbuffer updpkgsums {}
 echo "creating .SRCINFO"
 makepkg --printsrcinfo > .SRCINFO
 #sha256sum skywire-scripts.tar.gz
-echo "don't forget to increment pkgrel if you edited the PKGBUILD"
+echo "old pkgrel=$_prel"
 source PKGBUILD && echo "pkgver=${pkgver}" && echo "pkgrel=${pkgrel}"
 echo
 echo "git add -f " *PKGBUILD " .SRCINFO skywire-autoconfig " *.desktop *.png *.service *.sh *.conf *.install