From cfa533eaedf9e78bfadde65da22dba53a1f165a4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 1 Jun 2013 12:31:09 -0600
Subject: mv diff-unfree abslibre-tools/
---
src/abslibre-tools/diff-unfree | 89 ++++++++++++++++++++++++++++++++++++++++++
src/diff-unfree | 89 ------------------------------------------
2 files changed, 89 insertions(+), 89 deletions(-)
create mode 100755 src/abslibre-tools/diff-unfree
delete mode 100755 src/diff-unfree
(limited to 'src')
diff --git a/src/abslibre-tools/diff-unfree b/src/abslibre-tools/diff-unfree
new file mode 100755
index 0000000..59fcbae
--- /dev/null
+++ b/src/abslibre-tools/diff-unfree
@@ -0,0 +1,89 @@
+#!/bin/bash
+# This script will help you diff a *-libre PKGBUILD against the unfree one
+# to check for updates.
+# 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 <http://www.gnu.org/licenses/>.
+
+. libremessages
+. $(librelib conf.sh)
+load_files libretools
+check_vars libretools DIFFTOOL || exit 1
+
+cmd=${0##*/}
+
+usage() {
+ echo "Usage: $cmd [community|packages] [unfree-package] [repo]"
+ echo "Usage: $cmd --help"
+ echo "Helps you diff build scripts from ABSLibre against (Unfree) ABS."
+ echo ""
+ echo "Package name and repo will we guessed if you don't specify them."
+}
+
+main() {
+ if [[ "$1" == "--help" ]]; then
+ usage
+ exit 0
+ fi
+
+ local package_guess=${PWD##*/}
+ local repo=${1:-$(basename ${PWD%/*})}
+ local package=${2:-${package_guess%-libre}}
+ local trunk=${3:-trunk}
+
+ svnrepo="packages"
+ case $repo in
+ community*) svnrepo="community";;
+ multilib*) svnrepo="community";;
+ *) :;;
+ esac
+
+ if [[ ! -r PKGBUILD ]]; then
+ error "This is not a build dir."
+ exit 1
+ fi
+
+
+ tmp_dir="$(mktemp --tmpdir -d ${package}.XXXXXX)"
+ if [[ ! -d "${tmp_dir}" ]]; then
+ error "Can't create temp dir"
+ exit 1
+ fi
+ unfree_dir="${tmp_dir}/${svnrepo}/${package}/${trunk}"
+
+ pushd "${tmp_dir}" &>/dev/null
+
+ msg "Getting diff from $repo/$package..."
+
+ svn checkout --depth=empty svn://svn.archlinux.org/$svnrepo &>/dev/null
+
+ cd ${svnrepo}
+ svn update ${package}
+
+ # Back to start dir
+ popd &>/dev/null
+
+ msg "Diffing files"
+
+ for _file in ${unfree_dir}/*; do
+ msg2 "$(basename "${_file}")"
+ ${DIFFTOOL} "$PWD/$(basename "${_file}")" "${_file}"
+ done
+}
+
+main "$@"
diff --git a/src/diff-unfree b/src/diff-unfree
deleted file mode 100755
index 59fcbae..0000000
--- a/src/diff-unfree
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-# This script will help you diff a *-libre PKGBUILD against the unfree one
-# to check for updates.
-# 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 <http://www.gnu.org/licenses/>.
-
-. libremessages
-. $(librelib conf.sh)
-load_files libretools
-check_vars libretools DIFFTOOL || exit 1
-
-cmd=${0##*/}
-
-usage() {
- echo "Usage: $cmd [community|packages] [unfree-package] [repo]"
- echo "Usage: $cmd --help"
- echo "Helps you diff build scripts from ABSLibre against (Unfree) ABS."
- echo ""
- echo "Package name and repo will we guessed if you don't specify them."
-}
-
-main() {
- if [[ "$1" == "--help" ]]; then
- usage
- exit 0
- fi
-
- local package_guess=${PWD##*/}
- local repo=${1:-$(basename ${PWD%/*})}
- local package=${2:-${package_guess%-libre}}
- local trunk=${3:-trunk}
-
- svnrepo="packages"
- case $repo in
- community*) svnrepo="community";;
- multilib*) svnrepo="community";;
- *) :;;
- esac
-
- if [[ ! -r PKGBUILD ]]; then
- error "This is not a build dir."
- exit 1
- fi
-
-
- tmp_dir="$(mktemp --tmpdir -d ${package}.XXXXXX)"
- if [[ ! -d "${tmp_dir}" ]]; then
- error "Can't create temp dir"
- exit 1
- fi
- unfree_dir="${tmp_dir}/${svnrepo}/${package}/${trunk}"
-
- pushd "${tmp_dir}" &>/dev/null
-
- msg "Getting diff from $repo/$package..."
-
- svn checkout --depth=empty svn://svn.archlinux.org/$svnrepo &>/dev/null
-
- cd ${svnrepo}
- svn update ${package}
-
- # Back to start dir
- popd &>/dev/null
-
- msg "Diffing files"
-
- for _file in ${unfree_dir}/*; do
- msg2 "$(basename "${_file}")"
- ${DIFFTOOL} "$PWD/$(basename "${_file}")" "${_file}"
- done
-}
-
-main "$@"
--
cgit v1.2.3-2-g168b