Removed extra space from license messages

8 files changed, 217 insertions, 188 deletions

diff --git a/createworkdir b/createworkdir
index 1d4a929..2589a8a 100755
--- a/createworkdir
+++ b/createworkdir
@@ -2,24 +2,24 @@
 # CreateWorkDir
 # Creates a dir structure for working with Parabola packages
 
-#  Copyright 2010 Nicolás Reynolds
+# 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/>.       
+# ---------- 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/>. 
 
 source /etc/libretools.conf
 custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf
diff --git a/librechroot b/librechroot
index 688d8d2..63bf9b4 100755
--- a/librechroot
+++ b/librechroot
@@ -1,26 +1,26 @@
 #!/bin/bash
-#  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/>.       
+# 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/>. 
 
 [[ -z "${1}" ]] && {
-    echo "This scripts enters into the build chroot."
-    echo "Usage: $0 <chroot name>"
+ echo "This scripts enters into the build chroot."
+ echo "Usage: $0 <chroot name>"
     echo "Example: \`$0 root\` enters the 'root' chroot"
     exit 1
 }
diff --git a/librecommit b/librecommit
index f3ad816..9fc3391 100755
--- a/librecommit
+++ b/librecommit
@@ -1,22 +1,22 @@
 #!/bin/bash
-#  Copyright 2010 Nicolás Reynolds
+# 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/>.       
+# ---------- 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/>. 
 
 if [ ! -e PKGBUILD ]; then exit 1; fi
 
diff --git a/librediff b/librediff
index 08e7bb7..9715c53 100755
--- a/librediff
+++ b/librediff
@@ -1,24 +1,24 @@
 #!/bin/bash
 # Generates a patch for a nonfree PKGBUILD
 #
-#  Copyright 2010 Nicolás Reynolds
+# 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/>.       
+# ---------- 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/>. 
 
 usage() {
     echo "Usage: $0 <pkgname> [<pkgname2> ...]"
diff --git a/libremakepkg b/libremakepkg
index 1053872..2055002 100755
--- a/libremakepkg
+++ b/libremakepkg
@@ -1,22 +1,22 @@
 #!/bin/bash
-#  Copyright 2010 Nicolás Reynolds
+# 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/>.       
+# ---------- 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/>. 
 
 if [ $UID -ne 0 ]; then
     echo "This script must be run as root"
diff --git a/librerelease b/librerelease
index b47237b..ad083a3 100755
--- a/librerelease
+++ b/librerelease
@@ -2,84 +2,29 @@
 # Librerelease
 # Uploads packages into [staging]
 
-#  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/>.       
-
+# 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/>. 
 
 source /etc/libretools.conf
 custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf
 [[ -e $custom_config ]] && source $custom_config
 
-# End Config
-
-usage() {
-    echo "Usage: $0 <repo> [<repo2> ... ]"
-    echo ""
-    echo "LibreRelease will upload the package built by the PKGBUILD on the"
-    echo "current directory to the specified repo."
-}
-
-repos=$@
-
-if [ ${#repos} -eq 0 ]; then
-    usage
-    exit 1;
-fi
-
-[[ ! -e ./PKGBUILD ]] && {
-    echo "PKGBUILD not found"
-    exit 1
-}
-
-# Source the needed files
-source PKGBUILD
-source /etc/makepkg.conf
-[[ -e ~/.makepkg.conf ]] && source ~/.makepkg.conf
-
-# Default package location
-PKGDEST=${PKGDEST:-.}
-SRCPKGDEST=${SRCPKGDEST:-.}
-
-# Copies the packages to the specified repos inside staging
-for _arch in ${arch[@]}; do
-    for pkg in ${pkgname[@]}; do
-
-        pkgfile="$PKGDEST/$pkg-$pkgver-$pkgrel-$_arch$PKGEXT"
-
-        if [ -e "${pkgfile}" ]; then
-
-            for _repo in ${repos[@]}; do
-
-                cp "${pkgfile}" "${WORKDIR}/staging/${_repo}/" || {
-                    echo "Can't put ${pkgfile} on [staging]"
-                    exit 1
-                }
-
-            done
-
-        fi
-    done
-done
-
-# Use pkgbase for finding the sources tar
-[[ -z ${pkgbase} ]] && pkgbase=${pkgname}
-
 echo ":: Uploading packages..."
 rsync --recursive \
       --copy-links \
@@ -89,14 +34,9 @@ rsync --recursive \
       --progress \
       -e "ssh " \
       ${WORKDIR}/staging \
-      ${PARABOLAHOST}:/home/parabolavnx/${LIBREDESTDIR} || exit 1
-
-cat <<EOM
-From: you
-To: packages@list.parabolagnulinux.org
-Subject: [$pkgbase] $pkgver-$pkgrel staged on [${repos[@]}]
+      ${PARABOLAHOST}:${LIBREDESTDIR} || exit 1
 
-:)
-EOM
+echo ":: Removing packages from local [staging]"
+find ${WORKDIR}/staging/ -iname "*.pkg.tar.*" -delete
 
 exit 0
diff --git a/librestage b/librestage
new file mode 100755
index 0000000..2ac8adc
--- /dev/null
+++ b/librestage
@@ -0,0 +1,89 @@
+#!/bin/bash
+# LibreStage
+# Prepares packages for upload into [staging]
+
+# 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/>. 
+
+source /etc/libretools.conf
+custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf
+[[ -e $custom_config ]] && source $custom_config
+
+# End Config
+
+usage() {
+    cat <<EOU
+LibreStage  Copyright (C) 2011 Nicolás Reynolds
+This program comes with ABSOLUTELY NO WARRANTY.
+This is free software, and you are welcome to redistribute it
+under the terms of the GNU General Public License version 3 or later.
+
+
+Usage: $(basename $0) <repo> [<repo2> ... ]
+
+LibreRelease will stage for upload the package(s) built by the PKGBUILD on
+the current directory to the specified repo(s).
+EOU
+}
+
+repos=$@
+
+if [ ${#repos} -eq 0 ]; then
+    usage
+    exit 1;
+fi
+
+[[ ! -e ./PKGBUILD ]] && {
+    echo "PKGBUILD not found"
+    exit 1
+}
+
+# Source the needed files
+source PKGBUILD
+source /etc/makepkg.conf
+[[ -e ~/.makepkg.conf ]] && source ~/.makepkg.conf
+
+# Default package location
+PKGDEST=${PKGDEST:-.}
+SRCPKGDEST=${SRCPKGDEST:-.}
+
+# Copies the packages to the specified repos inside staging
+for _arch in ${arch[@]}; do
+    for pkg in ${pkgname[@]}; do
+
+        pkgfile="$PKGDEST/$pkg-$pkgver-$pkgrel-$_arch$PKGEXT"
+
+        if [ -e "${pkgfile}" ]; then
+
+            for _repo in ${repos[@]}; do
+
+                cp "${pkgfile}" "${WORKDIR}/staging/${_repo}/" || {
+                    echo "Can't put ${pkgfile} on [staging]"
+                    exit 1
+                }
+
+            done
+
+        fi
+    done
+done
+
+echo "${pkgname[@]} staged on [${repos[@]}]"
+
+exit 0
diff --git a/updateabslibre b/updateabslibre
index 9ccb60e..74c42f1 100755
--- a/updateabslibre
+++ b/updateabslibre
@@ -1,25 +1,25 @@
 #!/bin/bash
-#  UpdateABSLibre
-#  Updates the ABSLibre git repo
+# UpdateABSLibre
+# Updates the ABSLibre git repo
 
-#  Copyright 2010 Nicolás Reynolds
+# 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/>.       
+# ---------- 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/>. 
 
 source /etc/libretools.conf
 custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf