X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Ffreeside-debian-releases.sh;h=4e42c231fd2f00f8f8329ad4445a7a3e56c58762;hp=d715219d96ee6d26ce7dce396d712a8ed05f4919;hb=b71b1576c68bc40ad26592b354feace37a029f0e;hpb=d2b564e712d11494ab4d44ab361ed62aa51c1dbd

diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh
index d715219d9..4e42c231f 100755
--- a/bin/freeside-debian-releases.sh
+++ b/bin/freeside-debian-releases.sh
@@ -10,8 +10,8 @@ if [[ $# -ne 3 ]]
     exit;
 fi
 
-DATE=`date +"%Y%m%d"`
-DIR="/home/autobuild/packages/staging/freeside$FS_VERSION/$FS_REPO"
+DATE=`date +"%Y%m%d%H"`
+DIR="/home/autobuild/packages/staging/freeside$FS_VERSION/$DISTRO/$FS_REPO"
 TARGET="/home/autobuild/public_html/freeside$FS_VERSION-$DISTRO-$FS_REPO"
 
 if [ ! -d "$DIR" -a -d $TARGET ]; then
@@ -22,12 +22,19 @@ fi
 
 GIT_VERSION=`grep '^$VERSION' $DIR/freeside/FS/FS.pm | cut -d\' -f2`
 
-# Clean configuration file
-rm -fr $DIR/freeside/debian/freeside-ng-selfservice.conffiles
-
 # Pull any changes
 cd $DIR/freeside
 git checkout -- debian/changelog
+
+LOCAL=`git rev-parse FREESIDE_${FS_VERSION}_BRANCH`
+REMOTE=`git ls-remote origin -h refs/heads/FREESIDE_${FS_VERSION}_BRANCH | cut -f1`
+
+if [ $LOCAL = $REMOTE ]; then
+  echo "No new changes in git; aborting build."
+  exit #there's no new changes
+fi
+echo "New changes in git since last build; building new packages."
+
 git pull
 #STATUS=`git pull`
 
@@ -47,8 +54,9 @@ cd $TARGET && rm -f *.gz
 
 apt-ftparchive -qq packages ./ >Packages
 gzip -c Packages >Packages.gz
-bzip2 -c Packages >Packagez.bz2
+#bzip2 -c Packages >Packagez.bz2
 apt-ftparchive -qq sources ./ >Sources
 gzip -c Sources >Sources.gz
-bzip2 -c Sources >Sources.bz2
+#bzip2 -c Sources >Sources.bz2
+rm *bz2 || true
 apt-ftparchive -qq release ./ >Release