Merge branch 'master' of ssh://vparabola/srv/git/projects/libretools

Conflicts:
	toru

1 files changed, 18 insertions, 17 deletions

diff --git a/diff-unfree b/diff-unfree
index 86a537f..a0a8d63 100755
--- a/diff-unfree
+++ b/diff-unfree
@@ -4,21 +4,21 @@
 # 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/>. 
+
+# 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/>.
 
 source /etc/libretools.conf
 custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf
@@ -27,7 +27,7 @@ custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf
     msg "Diff-Unfree helps you diff build scripts from ABSLibre against
     (Unfree) ABS. Package name and repo will we guessed if you don't
     specify them."
-    msg2 "Usage: $0 [repo] [unfree-package]"
+    msg2 "Usage: $0 [community|packages] [unfree-package] [repo]"
     exit 0
 }
 
@@ -40,6 +40,7 @@ package_guess=$(basename $PWD)
 
 repo=${1:-$(basename $(dirname $PWD))}
 package=${2:-${package_guess/-libre}}
+trunk=${3:-trunk}
 
 tmp_dir=$(mktemp -d /tmp/${package}.XXXXXX)
 
@@ -55,7 +56,7 @@ case $repo in
         ;;
 esac
 
-unfree_dir="${tmp_dir}/${svnrepo}/${package}/trunk"
+unfree_dir="${tmp_dir}/${svnrepo}/${package}/${trunk}"
 
 [[ ! -d "${tmp_dir}" ]] && {
     error "Can't create temp dir"