From ed64cab6615f54f0069a4c48c45d6f1dc85cb9fa Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 1 Jun 2013 12:04:19 -0600 Subject: rm librediff --- src/librediff | 62 ----------------------------------------------------- src/libretools.conf | 4 ---- 2 files changed, 66 deletions(-) delete mode 100755 src/librediff diff --git a/src/librediff b/src/librediff deleted file mode 100755 index 3130b86..0000000 --- a/src/librediff +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -# Generates a patch for a nonfree PKGBUILD -# -# Copyright 2010 Nicolás Reynolds - -# ---------- GNU General Public License 3 ---------- - -# This file is part of Parabola. - -# Parabola is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# Parabola is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with Parabola. If not, see . - -. libremessages -. $(librelib conf.sh) -load_files libretools -check_vars libretools PATCHDIR || exit 1 - -cmd=${0##*/} - -usage() { - echo "Usage: $cmd [ ...]" - echo "Requirements:" - echo " * Have a / directory with nonfree build scripts inside" - echo " * Have a -libre/ directory with libre build scripts inside" -} - -main() { - local packages=("$@") - if [[ ${packages[#]} = 0 ]]; then - usage - exit 1 - fi - - for package in "${packages[@]}"; do - if [[ ! -f ./${package}/PKGBUILD || ! -f ./${package}-libre/PKGBUILD ]] - then - error "Build scripts not found for ${package}(-libre)" - else - ( - . ./${package}-libre/PKGBUILD - [[ -z ${pkgbase} ]] && pkgbase=${pkgname} - - # Generate a diff file, no -r since we don't want to patch src/ nor pkg/ - diff -auN ${package} ${package}-libre > $PATCHDIR/${pkgbase}-${pkgver}-${pkgrel}.patch - ) - fi - done - - exit 0 -} - -main "$@" diff --git a/src/libretools.conf b/src/libretools.conf index 3ca1fda..280bacf 100644 --- a/src/libretools.conf +++ b/src/libretools.conf @@ -11,10 +11,6 @@ BLACKLIST=https://repo.parabolagnulinux.org/docs/blacklist.txt ## Used by `aur`, `diff-unfree` DIFFTOOL=`which vimdiff gvimdiff meld colordiff diff 2>/dev/null|sed 's/\s.*//;1q'` -## Where to put generated patches -## Used by `librediff` -PATCHDIR=/home/$LIBREUSER/packages/patches - ## The repos you'll be packaging for ## Used by `toru`, `createworkdir` # Tip: As early repos take precedence on $REPOS loops, you can use this as -- cgit v1.2.3