autu: Update to 5.2.r223.c51f3c4-1

2 files changed, 58 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7f15e7181ce..656221e880b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = bashc
 	pkgdesc = Bash Commander is the GNU Bourne Again shell extended with two-panel OFM file manager.
-	pkgver = 4.3.r139.c6eb92e
+	pkgver = 5.2.r223.c51f3c4
 	pkgrel = 1
 	url = https://github.com/sergev/bash-commander
 	install = bashc.install
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = git
+	makedepends = cmake
 	depends = ncurses
 	depends = bash
+	depends = dialog
 	backup = etc/bash_commander
 	backup = etc/bash_dialog
 	source = git+https://github.com/sergev/bash-commander.git
 	sha256sums = SKIP
 
 pkgname = bashc
-
diff --git a/PKGBUILD b/PKGBUILD
index 73f292adcb16..0134e3705e2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,75 +5,97 @@
 
 # Finish install: https://github.com/sergev/bash-commander
 # add to ~/.bashrc
-#declare -x EDITOR="le"
-#declare -x VIEWER="le --read-only"
-#[ -s '/etc/bash_commander' ] && source '/etc/bash_commander'
-
-# I have no idea what editor "le" is
-
-# To test: quit mc, load bashc and hit ^O or enter on a blank line to show panels
+cmd1="
+declare -x EDITOR='le'
+declare -x VIEWER='le --read-only'
+[ -s '/etc/bash_commander' ] && source '/etc/bash_commander'
+"
+# bashc
+# Enter or ^O for panels
 
 # To jump from panels to command line: Hit ^O
 
 # To exit: Hit ^D
 
+# Next login will be bash with blue prompt. No panels. Run bashc to get panels.
+
 # To clean up after remove:
 # remove lines from ~/.bashrc
 # sudo rm -f '/etc/bash_commander' '/etc/bash_dialog'
 
+# Demo without modifying .bashrc
+# bashc # not a colored prompt, ^O does not bring up panels
+# source '/etc/bash_commander' # now a colored prompt. source does not load a shell. It only sets variables.
+# Hit Enter or ^O for panels, ^O for command line
+# ^D to exit bashc back to bash
+
+# Faster demo
+# bashc --init-file <(echo "source '/etc/bash_commander'")
+
 set -u
 _pkgname='bash-commander'
 pkgname='bashc'
-_pkgver='4.3' # no release tags
-pkgver=4.3.r139.c6eb92e
+_pkgver='5.2' # no release tags, scan git history for current version
+pkgver=5.2.r223.c51f3c4
 pkgrel=1
 pkgdesc='Bash Commander is the GNU Bourne Again shell extended with two-panel OFM file manager.'
 #url='http://Groups.google.com/group/bashc'
 #url='http://sourceforge.net/projects/bashc/'
-url="https://github.com/sergev/bash-commander"
-depends=('ncurses' 'bash')
-license=('GPL')
-install="${pkgname}.install"
 arch=('i686' 'x86_64')
+url='https://github.com/sergev/bash-commander'
+license=('GPL')
+depends=('ncurses' 'bash' 'dialog')
+makedepends=('git' 'cmake')
 backup=('etc/bash_commander' 'etc/bash_dialog')
+install="${pkgname}.install"
 #source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz")
-source=("git+https://github.com/sergev/bash-commander.git")
+_srcdir="${_pkgname}"
+source=("git+${url}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${_pkgname}"
-  printf "%s.r%s.%s" "${_pkgver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  set -u
+  cd "${_srcdir}"
+  printf '%s.r%s.%s' "${_pkgver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  set +u
 }
 
 prepare() {
   set -u
-  cd "${srcdir}/${_pkgname}"
-  ./configure --prefix='/usr' --sysconfdir="/etc/${pkgname}" --with-curses --enable-readline
-  sed -i -e 's:$(DESTDIR)$(prefix)/etc/:$(DESTDIR)/etc/:g' 'Makefile'
+  cd "${_srcdir}"
+  local _seds=(
+    -e '# gets binary in right place, still need to move /etc'
+    -e '/cmake -B/ s:$: -DCMAKE_INSTALL_PREFIX=/usr:g'
+    -e '# make install is not allowed to build'
+    -e '/^install:/ s:build::g'
+  )
+  sed -E "${_seds[@]}" -i 'Makefile'
   set +u
+
 }
 
 build() {
   set -u
-  cd "${srcdir}/${_pkgname}"
-  make -s -j $(nproc)
+  cd "${_srcdir}"
+  # cmake is called by the Makefile
+  nice make -s
   set +u
 }
 
 package() {
   set -u
-  cd "${srcdir}/${_pkgname}"
-  install -dm755 "${pkgdir}/etc"
+  cd "${_srcdir}"
   make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/share"
-  rm -f "${pkgdir}/usr/bin/bashbug"
-  sed -i -e 's:/usr/local/etc/:/etc/:g' "${pkgdir}/etc/bash_commander"
-
-  # Ensure there are no forbidden paths (git-aurcheck)
-  #! grep -alqr "/sbin" "${pkgdir}" || echo "${}" # Only one instance left and it's POSIX
-  #! grep -alqr "/usr/tmp" "${pkgdir}" || echo "${}" # This is fail over so it's OK
-  #! grep -alqr "/usr/local" "${pkgdir}" || echo "${}"
-  ! test -d "${pkgdir}/usr/sbin" || echo "${}"
+  if :; then
+    cd "${pkgdir}"
+    install -d "${pkgdir}/etc/${pkgbase}"
+    #rm -rf "${pkgdir}/usr/share"
+    #rm -f "${pkgdir}/usr/bin/bashbug"
+    install -dm755 'etc'
+    mv usr/etc/* etc/
+    rmdir usr/etc
+    sed -e 's:/usr/local/etc/:/etc/:g' -i 'etc/bash_commander'
+  fi
   set +u
 }
 set +u