From: Ivan Kohler Date: Mon, 27 Nov 2017 21:22:32 +0000 (-0800) Subject: fix autobuild change detection for two OS trees X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=a94906852f983d71d7b022f402ba74c7e9c90bad;hp=b96df4d4dcfebb3df16af89b884e63164bcf15e5 fix autobuild change detection for two OS trees --- diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh index 13dbccea3..4e42c231f 100755 --- a/bin/freeside-debian-releases.sh +++ b/bin/freeside-debian-releases.sh @@ -11,7 +11,7 @@ if [[ $# -ne 3 ]] fi DATE=`date +"%Y%m%d%H"` -DIR="/home/autobuild/packages/staging/freeside$FS_VERSION/$FS_REPO" +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,9 +22,6 @@ 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