diff options
| author | Alexander Jacocks | 2021-04-07 10:43:48 -0400 |
|---|---|---|
| committer | Alexander Jacocks | 2021-04-07 10:43:48 -0400 |
| commit | 11c1ecf5934346086bb624d5a83ce5981dc576e5 (patch) | |
| tree | efb7ef187bf3316de11f2838de51c803cadc7935 | |
| parent | e85c68709ad00505249a2be5e9d24bd1c8895663 (diff) | |
| download | aur-11c1ecf5934346086bb624d5a83ce5981dc576e5.tar.gz | |
updates from narukeh
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | PKGBUILD | 29 |
2 files changed, 11 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..ced49c43513d --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +pkg +*.zst +simh +src @@ -2,7 +2,7 @@ # Maintainer emeritus: R. van Elst <https://raymii.org> pkgname="simh-git" -pkgver=4.0.Beta.1.2670.g3c1c92dc +pkgver=4.0.Beta.1.2670.g3c1c92dc pkgrel=2 pkgdesc="The Computer History Simulation Project" arch=('i686' 'x86_64') @@ -15,8 +15,6 @@ conflicts=("${pkgname%-*}") source=('git+https://github.com/simh/simh.git') sha512sums=('SKIP') -_cpus=$( nproc ) - pkgver() { cd "${pkgname%-*}" printf "%s" "$(git describe --long --tags | sed 's/v//; s/-/./g')" @@ -24,11 +22,7 @@ pkgver() { build() { cd "${pkgname%-*}" - if [ $_cpus -gt 1 ]; then - make -j $_cpus - else - make - fi + { test "$(nproc)" -gt 1 && make -j"$(nproc)" ;} || make } package() { @@ -36,20 +30,12 @@ package() { install -d "$pkgdir/usr/bin" cd "$srcdir/simh/BIN" for i in *; do - if [ -d "$i" ]; then - echo "Skipping directory $i." - else - install "$i" "$pkgdir/usr/bin/simh-$i" - fi + { test -d "$i" && echo "Skipping directory $i." ;} || install "$i" "$pkgdir/usr/bin/simh-$i" done cd "$srcdir/simh/BIN/buildtools" echo "Entering directory $srcdir/simh/BIN/buildtools." for i in *; do - if [ -d "$i" ]; then - echo "Skipping directory $i." - else - install "$i" "$pkgdir/usr/bin/simh-$i" - fi + { test -d "$i" && echo "Skipping directory $i." ;} || install "$i" "$pkgdir/usr/bin/simh-$i" done for dir in VAX swtp6800/swtp6800 3B2; do @@ -61,8 +47,9 @@ package() { echo "Entering directory $srcdir/simh/doc." cd "$srcdir/simh/doc" - unoconv -d document --format=txt *.doc - install -D -t "$pkgdir/usr/share/doc/$pkgname" *.doc + unoconv -d document --format=html *.doc + # install -D -t "$pkgdir/usr/share/doc/$pkgname" *.doc + install -D -t "$pkgdir/usr/share/doc/$pkgname" *.html install -D -t "$pkgdir/usr/share/doc/$pkgname" *.pdf install -D -t "$pkgdir/usr/share/doc/$pkgname" *.txt @@ -71,5 +58,3 @@ package() { install -D -t "$pkgdir/usr/share/doc/$pkgname" *.md install -D -t "$pkgdir/usr/share/doc/$pkgname" *.txt } - - |