Merge pull request #12 from RogueM/commit

latest make files

Author: Gadgetoid

packaging/makeall.sh

@@ -4,6 +4,7 @@
 
 reponame="" # leave this blank for auto-detection
 libname="" # leave this blank for auto-detection
+packagename="" # leave this blank for auto-selection
 
 debianlog="debian/changelog"
 debcontrol="debian/control"
@@ -60,7 +61,12 @@ if [ -z "$libname" ]; then
     libname=$(echo "$libname" | tr "[A-Z]" "[a-z]") && cd "$debdir"
 fi
 
+if [ -z "$packagename" ]; then
+    packagename="$libname"
+fi
+
 echo "reponame is $reponame and libname is $libname"
+echo "output packages will be python-$packagename and python3-$packagename"
 
 # checking generating changelog file
 
@@ -83,31 +89,31 @@ fi
 
 inform "checking debian/copyright file..."
 
-if ! grep "^Source" $debcopyright | grep "$libname" $debcopyright &> /dev/null; then
+if ! grep "^Source" $debcopyright | grep "$reponame" &> /dev/null; then
     warning "$(grep "^Source" $debcopyright)" && FLAG=true
 fi
 
-if ! grep "^Upstream-Name" $debcopyright | grep "$libname" $debcopyright &> /dev/null; then
+if ! grep "^Upstream-Name" $debcopyright | grep "$libname" &> /dev/null; then
     warning "$(grep "^Upstream-Name" $debcopyright)" && FLAG=true
 fi
 
 # checking debian/control file
 
 inform "checking debian/control file..."
 
-if ! grep "^Source" $debcontrol | grep "$libname" $debcontrol &> /dev/null; then
+if ! grep "^Source" $debcontrol | grep "$libname" &> /dev/null; then
     warning "$(grep "^Source" $debcontrol)" && FLAG=true
 fi
 
-if ! grep "^Homepage" $debcontrol | grep "$reponame" $debcontrol &> /dev/null; then
+if ! grep "^Homepage" $debcontrol | grep "$reponame" &> /dev/null; then
     warning "$(grep "^Homepage" $debcontrol)" && FLAG=true
 fi
 
-if ! grep "^Package: python-$libname" $debcontrol &> /dev/null; then
+if ! grep "^Package: python-$packagename" $debcontrol &> /dev/null; then
     warning "$(grep "^Package: python-" $debcontrol)" && FLAG=true
 fi
 
-if ! grep "^Package: python3-$libname" $debcontrol &> /dev/null; then
+if ! grep "^Package: python3-$packagename" $debcontrol &> /dev/null; then
     warning "$(grep "^Package: python3-" $debcontrol)" && FLAG=true
 fi
 
@@ -120,11 +126,11 @@ fi
 
 inform "checking debian/rules file..."
 
-if ! grep "debian/python-$libname" $debrules &> /dev/null; then
+if ! grep "debian/python-$packagename" $debrules &> /dev/null; then
     warning "$(grep "debian/python-" $debrules)" && FLAG=true
 fi
 
-if ! grep "debian/python3-$libname" $debrules &> /dev/null; then
+if ! grep "debian/python3-$packagename" $debrules &> /dev/null; then
     warning "$(grep "debian/python3-" $debrules)" && FLAG=true
 fi
 

packaging/makelog.sh

@@ -3,7 +3,8 @@
 # script control variables
 
 libname="" # leave this blank for auto-detection
-vlibwarn="yes"
+sibname=() # name of sibling in packages list
+versionwarn="yes" # set to anything but 'yes' to turn off warning
 
 debdir="$(pwd)"
 rootdir="$(dirname $debdir)"
@@ -50,27 +51,32 @@ inform "pypi changelog generated"
 
 if [ -n $(grep version "$libdir/setup.py" &> /dev/null) ]; then
     inform "touched up version in setup.py"
-    sed -i "s/[0-9].[0-9].[0-9]/$version/" "$libdir/setup.py"
+    sed -i "s/'[0-9].[0-9].[0-9]'/'$version'/" "$libdir/setup.py"
 else
     warning "couldn't touch up version in setup, no match found"
 fi
 
-# touch up version in lib
+# touch up version in lib or package siblings
 
 if [ -z "$libname" ]; then
     cd "$libdir"
     libname=$(grep "name" setup.py | tr -d "[:space:]" | cut -c 7- | rev | cut -c 3- | rev)
     libname=$(echo "$libname" | tr "[A-Z]" "[a-z]") && cd "$debdir"
+    sibname+=( "$libname" )
+elif [ "$libname" != "package" ]; then
+    sibname+=( "$libname" )
 fi
 
-if grep -e "__version__" "$libdir/$libname.py" &> /dev/null; then
-    sed -i "s/__version__ = '[0-9].[0-9].[0-9]/__version__ = '$version/" "$libdir/$libname.py"
-    inform "touched up version in $(basename $libdir/$libname.py)"
-elif grep -e "__version__" "$libdir/$libname/__init__.py" &> /dev/null; then
-    sed -i "s/__version__ = '[0-9].[0-9].[0-9]/__version__ = '$version/" "$libdir/$libname/__init__.py"
-    inform "touched up version in $(basename $libdir/$libname/__init__.py)"
-elif [ "$vlibwarn" == "yes" ]; then
-    warning "couldn't touch up __version__ in lib, no match found"
-fi
+for sibling in ${sibname[@]}; do
+    if grep -e "__version__" "$libdir/$sibling.py" &> /dev/null; then
+        sed -i "s/__version__ = '[0-9].[0-9].[0-9]'/__version__ = '$version'/" "$libdir/$sibling.py"
+        inform "touched up version in $sibling.py"
+    elif grep -e "__version__" "$libdir/$sibling/__init__.py" &> /dev/null; then
+        sed -i "s/__version__ = '[0-9].[0-9].[0-9]'/__version__ = '$version'/" "$libdir/$sibling/__init__.py"
+        inform "touched up version in $sibling/__init__.py"
+    elif [ "$versionwarn" == "yes" ]; then
+        warning "couldn't touch up __version__ in $sibling, no match found"
+    fi
+done
 
 exit 0