dot

packages and services management
Log | Files | Refs | README

commit 4f11c967e7653e9370bf3cc992cda083fbad31f3
parent 7d57a96a103b14a86590d45d01ce7535dffe086e
Author: Josuah Demangeon <josuah.demangeon@gandi.net>
Date:   Fri, 21 Jul 2017 00:18:06 +0200

more conventionnal directory names

Diffstat:
MBUILD | 8++++----
MDOWNLOAD | 27+++++++++++++++------------
MSERVICE | 2+-
Abusybox/build | 4++++
Abusybox/url | 1+
Dctags/url | 1-
Ddash/build | 2--
Ddash/url | 1-
Dlib-libressl/url | 1-
Rlib-bearssl/build -> libbearssl/build | 0
Rlib-bearssl/url -> libbearssl/url | 0
Rlib-c/url -> libc/url | 0
Rlib-ixp/url -> libixp/url | 0
Rlib-lzma/url -> liblzma/url | 0
Rlib-nacl/build -> libnacl/build | 0
Rlib-nacl/url -> libnacl/url | 0
Rlib-openssl/build -> libopenssl/build | 0
Rlib-openssl/url -> libopenssl/url | 0
Alibopus/url | 1+
Rlib-tox/build -> libtox/build | 0
Rlib-tox/url -> libtox/url | 0
Rlib-utf/url -> libutf/url | 0
Alibvpx/url | 1+
Dlua/build | 1-
Dlua/url | 1-
Dsbase/url | 1-
Astunnel/build | 5+++++
Astunnel/url | 1+
Dubase/url | 1-
29 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/BUILD b/BUILD @@ -1,7 +1,7 @@ . "${0%/*}/profile" -cd "$OPT/$1" && export PREFIX="$PWD" || exit 1 - +mkdir -p "$OPT/$1" && cd "$OPT/$1" || exit 1 +export PREFIX="$PWD" mkdir -p bin etc include lib share/man ln -s bin sbin @@ -11,8 +11,8 @@ if [ -f "$ETC/$1/build" ] then sh "$ETC/$1/build" else - find "$ETC/${PWD##*/}" -name '*.diff' -exec patch -N -p 1 -i {} \; - find "$ETC/${PWD##*/}" -name 'config.*' -exec cp -f {} . \; + find "$ETC/${PWD##*/}" -name '*.diff' | xargs -n 1 patch -N -p 1 -i + find "$ETC/${PWD##*/}" -name 'config.*' | xargs -I % cp -f % . [ -f ./configure ] && ./configure --prefix="$PREFIX" make && make PREFIX="$PREFIX" install clean fi diff --git a/DOWNLOAD b/DOWNLOAD @@ -2,17 +2,20 @@ read url < "$ETC/$1/url" -[ -e "$SRC/$1" ] && return 0 -[ -e "$OPT/$1" ] && rm -r "$OPT/$1" +[ -e "$SRC/$1" ] && exit 1 -case "$url" in -( *.tar ) opt='' ;; -( *.tbz2 | *.tar.bz2 ) opt='j' ;; -( *.tgz | *.tar.gz ) opt='z' ;; -( *.txz | *.tar.xz ) opt='J' ;; -( * ) exit 1 ;; -esac +mkdir -p "$SRC/$1" && cd "$SRC/$1" -mkdir -p "$OPT/$1" "$SRC" -wget -qO - "$url" | tar -xv"$opt"f - -C "$OPT/$1" -mv "$OPT/$1"/* "$SRC/$1" +wget -qO - "$url" | case "$url" in +(*.tar.bz2 | *.tbz2) bunzip2 -d ;; +(*.tar.gz | *.tgz ) gzip -d ;; +(*.tar.xz | *.txz ) xz -d ;; +(*.tar ) tee ;; +esac | tar -xvf - + +if [ $(ls "$SRC/$1" | wc -l) = 1 ] +then + dir=$(ls "$SRC/$1") + find "$SRC/$1" -mindepth 2 -maxdepth 2 | xargs -I % mv % "$SRC/$1" + rmdir "$SRC/$1/$dir" +fi diff --git a/SERVICE b/SERVICE @@ -70,4 +70,4 @@ find "$VAR/pid" -type f | while IFS='' read path do cmp "$path" "/proc/${path##*/}/cmdline" 2> /dev/null || rm -f "$path" done -find "$VAR/pid" -depth -type d -exec rmdir {} + 2> /dev/null || true +find "$VAR/pid" -depth -type d | xargs rmdir 2> /dev/null || true diff --git a/busybox/build b/busybox/build @@ -0,0 +1,4 @@ +make defconfig && make + +mkdir -p "$PREFIX/bin" +cp busybox "$PREFIX/bin" diff --git a/busybox/url b/busybox/url @@ -0,0 +1 @@ +http://busybox.net/downloads/busybox-1.27.1.tar.bz2 diff --git a/ctags/url b/ctags/url @@ -1 +0,0 @@ -http://prdownloads.sourceforge.net/ctags/ctags-5.8.tar.gz diff --git a/dash/build b/dash/build @@ -1,2 +0,0 @@ -./configure --prefix="$PREFIX" -gmake install diff --git a/dash/url b/dash/url @@ -1 +0,0 @@ -http://http.debian.net/debian/pool/main/d/dash/dash_0.5.7.orig.tar.gz diff --git a/lib-libressl/url b/lib-libressl/url @@ -1 +0,0 @@ -http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.5.1.tar.gz diff --git a/lib-bearssl/build b/libbearssl/build diff --git a/lib-bearssl/url b/libbearssl/url diff --git a/lib-c/url b/libc/url diff --git a/lib-ixp/url b/libixp/url diff --git a/lib-lzma/url b/liblzma/url diff --git a/lib-nacl/build b/libnacl/build diff --git a/lib-nacl/url b/libnacl/url diff --git a/lib-openssl/build b/libopenssl/build diff --git a/lib-openssl/url b/libopenssl/url diff --git a/libopus/url b/libopus/url @@ -0,0 +1 @@ +http://archive.mozilla.org/pub/opus/opus-1.2.1.tar.gz diff --git a/lib-tox/build b/libtox/build diff --git a/lib-tox/url b/libtox/url diff --git a/lib-utf/url b/libutf/url diff --git a/libvpx/url b/libvpx/url @@ -0,0 +1 @@ +http://chromium.googlesource.com/webm/libvpx/+archive/master.tar.gz diff --git a/lua/build b/lua/build @@ -1 +0,0 @@ -make MYCFLAGS='-fPIC' INSTALL_TOP="$PREFIX" posix install diff --git a/lua/url b/lua/url @@ -1 +0,0 @@ -http://www.lua.org/ftp/lua-5.3.2.tar.gz diff --git a/sbase/url b/sbase/url @@ -1 +0,0 @@ -http://git.suckless.org/sbase/snapshot/sbase-HEAD.tar.gz diff --git a/stunnel/build b/stunnel/build @@ -0,0 +1,5 @@ +./configure \ + --prefix="$PREIFX" \ + --with-ssl="$OPT/libopenssl" + +make && make install diff --git a/stunnel/url b/stunnel/url @@ -0,0 +1 @@ +http://www.stunnel.org/downloads/stunnel-5.42.tar.gz diff --git a/ubase/url b/ubase/url @@ -1 +0,0 @@ -http://git.suckless.org/ubase/snapshot/ubase-0.1.tar.gz