From f4bb247bd63762fb431fc8ec60ccf8fc4f63aeed Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 25 Aug 2016 10:06:23 -0500 Subject: fetch-kde-qt.sh: modularize script allowing multiple versions --- maintainers/scripts/fetch-kde-qt.sh | 19 ++++++++++++++----- maintainers/scripts/generate-kde-applications.sh | 5 ----- maintainers/scripts/generate-kde-frameworks.sh | 5 ----- maintainers/scripts/generate-kde-plasma.sh | 5 ----- maintainers/scripts/generate-qt.sh | 6 ------ 5 files changed, 14 insertions(+), 26 deletions(-) delete mode 100755 maintainers/scripts/generate-kde-applications.sh delete mode 100755 maintainers/scripts/generate-kde-frameworks.sh delete mode 100755 maintainers/scripts/generate-kde-plasma.sh delete mode 100755 maintainers/scripts/generate-qt.sh (limited to 'maintainers') diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index c88d8729acea8..d7a9239027d8d 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -1,9 +1,18 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils findutils gnused nix wget +SRCS= +if [ -d "$1" ]; then + SRCS="$(pwd)/$1/srcs.nix" + . "$1/fetch.sh" +else + SRCS="$(pwd)/$(dirname $1)/srcs.nix" + . "$1" +fi + tmp=$(mktemp -d) pushd $tmp >/dev/null -wget -nH -r -c --no-parent "$@" >/dev/null +wget -nH -r -c --no-parent "${WGET_ARGS[@]}" >/dev/null csv=$(mktemp) find . -type f | while read src; do @@ -15,8 +24,8 @@ find . -type f | while read src; do echo "$name,$version,$src,$filename" >>$csv done -cat <"$SRCS" <>"$SRCS" <>"$SRCS" popd >/dev/null rm -fr $tmp >/dev/null diff --git a/maintainers/scripts/generate-kde-applications.sh b/maintainers/scripts/generate-kde-applications.sh deleted file mode 100755 index eee0c2749a09d..0000000000000 --- a/maintainers/scripts/generate-kde-applications.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -./maintainers/scripts/fetch-kde-qt.sh \ - http://download.kde.org/stable/applications/16.08.0/ -A '*.tar.xz' \ - >pkgs/desktops/kde-5/applications/srcs.nix diff --git a/maintainers/scripts/generate-kde-frameworks.sh b/maintainers/scripts/generate-kde-frameworks.sh deleted file mode 100755 index b3b559b357160..0000000000000 --- a/maintainers/scripts/generate-kde-frameworks.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -./maintainers/scripts/fetch-kde-qt.sh \ - http://download.kde.org/stable/frameworks/5.24/ -A '*.tar.xz' \ - >pkgs/desktops/kde-5/frameworks/srcs.nix diff --git a/maintainers/scripts/generate-kde-plasma.sh b/maintainers/scripts/generate-kde-plasma.sh deleted file mode 100755 index 24760e7ac0843..0000000000000 --- a/maintainers/scripts/generate-kde-plasma.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -./maintainers/scripts/fetch-kde-qt.sh \ - http://download.kde.org/stable/plasma/5.7.3/ -A '*.tar.xz' \ - >pkgs/desktops/kde-5/plasma/srcs.nix diff --git a/maintainers/scripts/generate-qt.sh b/maintainers/scripts/generate-qt.sh deleted file mode 100755 index a4d79c1aac587..0000000000000 --- a/maintainers/scripts/generate-qt.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -./maintainers/scripts/fetch-kde-qt.sh \ - http://download.qt.io/official_releases/qt/5.7/5.7.0/submodules/ \ - -A '*.tar.xz' \ - >pkgs/development/libraries/qt-5/5.7/srcs.nix -- cgit 1.4.1