From e2776099fbdc05985929eab80fbdaeb41dd4f991 Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Sat, 9 May 2020 14:09:43 +0300 Subject: [PATCH] fix formatting for some packages %ci:no-build --- packages/dte/build.sh | 6 +++--- packages/gkermit/build.sh | 7 ++++--- packages/ipfs/build.sh | 37 ++++++++++++++++++------------------ packages/pup/build.sh | 18 +++++++++--------- packages/shell2http/build.sh | 20 +++++++++---------- packages/swift/build.sh | 2 +- packages/youtubedr/build.sh | 21 ++++++++++---------- 7 files changed, 54 insertions(+), 57 deletions(-) diff --git a/packages/dte/build.sh b/packages/dte/build.sh index 5c144d41e..e88e0bff4 100644 --- a/packages/dte/build.sh +++ b/packages/dte/build.sh @@ -8,9 +8,9 @@ TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, libiconv, ncurses" TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { - make \ - -j$TERMUX_MAKE_PROCESSES V=1 \ - LDLIBS='-landroid-support -landroid-glob -liconv -lcurses' + make \ + -j$TERMUX_MAKE_PROCESSES V=1 \ + LDLIBS='-landroid-support -landroid-glob -liconv -lcurses' } termux_step_make_install() { diff --git a/packages/gkermit/build.sh b/packages/gkermit/build.sh index e16c9cfb0..541f063dd 100644 --- a/packages/gkermit/build.sh +++ b/packages/gkermit/build.sh @@ -9,7 +9,8 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_MAKE_PROCESSES=1 termux_step_post_extract_package() { - filename=$(basename "$TERMUX_PKG_SRCURL") - local file="$TERMUX_PKG_CACHEDIR/$filename" - tar xf "$file" -C "$TERMUX_PKG_SRCDIR" + local file filename + filename=$(basename "$TERMUX_PKG_SRCURL") + file="$TERMUX_PKG_CACHEDIR/$filename" + tar xf "$file" -C "$TERMUX_PKG_SRCDIR" } diff --git a/packages/ipfs/build.sh b/packages/ipfs/build.sh index de2fcb583..a8ff19c2c 100644 --- a/packages/ipfs/build.sh +++ b/packages/ipfs/build.sh @@ -7,31 +7,30 @@ TERMUX_PKG_SRCURL=https://github.com/ipfs/go-ipfs/releases/download/v${TERMUX_PK TERMUX_PKG_SHA256=f0f9f3d7708cfbde95bbcae0543fc873a5a46824be17e94ad95f39a182fae356 termux_step_make() { - termux_setup_golang + termux_setup_golang - export GOPATH=${TERMUX_PKG_BUILDDIR} - export GOARCH=${TERMUX_ARCH} + export GOPATH=${TERMUX_PKG_BUILDDIR} + export GOARCH=${TERMUX_ARCH} - if [ "${TERMUX_ARCH}" = "aarch64" ]; then - GOARCH="arm64" - elif [ "${TERMUX_ARCH}" = "i686" ]; then - GOARCH="386" - elif [ "${TERMUX_ARCH}" = "x86_64" ]; then - GOARCH="amd64" - fi + if [ "${TERMUX_ARCH}" = "aarch64" ]; then + GOARCH="arm64" + elif [ "${TERMUX_ARCH}" = "i686" ]; then + GOARCH="386" + elif [ "${TERMUX_ARCH}" = "x86_64" ]; then + GOARCH="amd64" + fi - mkdir -p "${GOPATH}/src/github.com/ipfs" - cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/ipfs/go-ipfs" - cd "${GOPATH}/src/github.com/ipfs/go-ipfs" + mkdir -p "${GOPATH}/src/github.com/ipfs" + cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/ipfs/go-ipfs" + cd "${GOPATH}/src/github.com/ipfs/go-ipfs" - make build + make build - # Fix folders without write permissions preventing which fails repeating builds: - cd $TERMUX_PKG_BUILDDIR - find . -type d -exec chmod u+w {} \; + # Fix folders without write permissions preventing which fails repeating builds: + cd $TERMUX_PKG_BUILDDIR + find . -type d -exec chmod u+w {} \; } termux_step_make_install() { - mkdir -p "${TERMUX_PREFIX}/bin" - cp -f "${TERMUX_PKG_BUILDDIR}/src/github.com/ipfs/go-ipfs/cmd/ipfs/ipfs" "${TERMUX_PREFIX}/bin/" + install -Dm700 -t "$TERMUX_PREFIX"/bin "${TERMUX_PKG_BUILDDIR}/src/github.com/ipfs/go-ipfs/cmd/ipfs/ipfs" } diff --git a/packages/pup/build.sh b/packages/pup/build.sh index c750efa00..825695c10 100644 --- a/packages/pup/build.sh +++ b/packages/pup/build.sh @@ -7,18 +7,18 @@ TERMUX_PKG_SRCURL=https://github.com/ericchiang/pup/archive/v${TERMUX_PKG_VERSIO TERMUX_PKG_SHA256=0d546ab78588e07e1601007772d83795495aa329b19bd1c3cde589ddb1c538b0 termux_step_make() { - termux_setup_golang + termux_setup_golang - cd "$TERMUX_PKG_SRCDIR" + cd "$TERMUX_PKG_SRCDIR" - export GOPATH="${TERMUX_PKG_BUILDDIR}" - mkdir -p "${GOPATH}/src/github.com/ericchiang/" - cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/ericchiang/pup" - cd "${GOPATH}/src/github.com/ericchiang/pup" - go get -d -v - go build + export GOPATH="${TERMUX_PKG_BUILDDIR}" + mkdir -p "${GOPATH}/src/github.com/ericchiang/" + cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/ericchiang/pup" + cd "${GOPATH}/src/github.com/ericchiang/pup" + go get -d -v + go build } termux_step_make_install() { - install -Dm700 "$GOPATH"/src/github.com/ericchiang/pup/pup "$TERMUX_PREFIX"/bin/ + install -Dm700 -t "$TERMUX_PREFIX"/bin "$GOPATH"/src/github.com/ericchiang/pup/pup } diff --git a/packages/shell2http/build.sh b/packages/shell2http/build.sh index eca3a503f..b7923a04d 100644 --- a/packages/shell2http/build.sh +++ b/packages/shell2http/build.sh @@ -7,20 +7,18 @@ TERMUX_PKG_SRCURL=https://github.com/msoap/shell2http/archive/${TERMUX_PKG_VERSI TERMUX_PKG_SHA256=6094762a3e54efddcbc361d80ef281624d2647f17f6b0c787cab713626d861e3 termux_step_make() { - termux_setup_golang + termux_setup_golang - cd "$TERMUX_PKG_SRCDIR" + cd "$TERMUX_PKG_SRCDIR" - export GOPATH="${TERMUX_PKG_BUILDDIR}" - mkdir -p "${GOPATH}/src/github.com/msoap/" - cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/msoap/shell2http" - cd "${GOPATH}/src/github.com/msoap/shell2http" - go get -d -v - go build + export GOPATH="${TERMUX_PKG_BUILDDIR}" + mkdir -p "${GOPATH}/src/github.com/msoap/" + cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/msoap/shell2http" + cd "${GOPATH}/src/github.com/msoap/shell2http" + go get -d -v + go build } termux_step_make_install() { - install -Dm700 \ - "$GOPATH"/src/github.com/msoap/shell2http/shell2http \ - "$TERMUX_PREFIX"/bin/ + install -Dm700 -t "$TERMUX_PREFIX"/bin "$GOPATH"/src/github.com/msoap/shell2http/shell2http } diff --git a/packages/swift/build.sh b/packages/swift/build.sh index b7a51beb3..d4e54cf06 100644 --- a/packages/swift/build.sh +++ b/packages/swift/build.sh @@ -53,7 +53,7 @@ termux_step_post_extract_package() { $TERMUX_PKG_CACHEDIR/$library-$TERMUX_PKG_VERSION.tar.gz \ ${library_checksums[$library]} tar xf $TERMUX_PKG_CACHEDIR/$library-$TERMUX_PKG_VERSION.tar.gz - mv $library-swift-${TERMUX_PKG_VERSION}-$SWIFT_RELEASE $library + mv $library-swift-${TERMUX_PKG_VERSION}-$SWIFT_RELEASE $library done mv swift-cmark cmark diff --git a/packages/youtubedr/build.sh b/packages/youtubedr/build.sh index 281707ff5..56808b472 100644 --- a/packages/youtubedr/build.sh +++ b/packages/youtubedr/build.sh @@ -7,20 +7,19 @@ TERMUX_PKG_SRCURL=https://github.com/kkdai/youtube/archive/v${TERMUX_PKG_VERSION TERMUX_PKG_SHA256=20946b843b9584dd044ec4d8b412365511338c568a37a6170acabea2bb3e2661 termux_step_make() { - termux_setup_golang + termux_setup_golang - cd "$TERMUX_PKG_SRCDIR" + cd "$TERMUX_PKG_SRCDIR" - export GOPATH="${TERMUX_PKG_BUILDDIR}" - mkdir -p "${GOPATH}/src/github.com/kkdai/" - cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/kkdai/youtube" - cd "${GOPATH}/src/github.com/kkdai/youtube/" - go get -d -v - cd youtubedr - go build . + export GOPATH="${TERMUX_PKG_BUILDDIR}" + mkdir -p "${GOPATH}/src/github.com/kkdai/" + cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/kkdai/youtube" + cd "${GOPATH}/src/github.com/kkdai/youtube/" + go get -d -v + cd youtubedr + go build . } termux_step_make_install() { - install -Dm700 -t "$TERMUX_PREFIX"/bin \ - "$GOPATH"/src/github.com/kkdai/youtube/youtubedr/youtubedr + install -Dm700 -t "$TERMUX_PREFIX"/bin "$GOPATH"/src/github.com/kkdai/youtube/youtubedr/youtubedr }