Skip to content

U
uniset2
Commit 003f7f6a authored by Hanadeev Alexandr's avatar Hanadeev Alexandr Committed by Pavel Vainerman
Browse files
Options

(conf): добавил в release_helper определение платформы

parent 454dc5f9
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
conf/release_helper.sh
View file @ 003f7f6a
...@@ -14,17 +14,20 @@ TOPDIR=/var/ftp/pvt/Etersoft/Ourside/ ...@@ -14,17 +14,20 @@ TOPDIR=/var/ftp/pvt/Etersoft/Ourside/
PKGNAME=uniset2 PKGNAME=uniset2
SPECNAME=libuniset2.spec SPECNAME=libuniset2.spec
PLATFORM=i586
[[ `uname -m` == "x86_64" ]] && PLATFORM=x86_64
PROJECT=$1 PROJECT=$1
test -n "$PROJECT" || PROJECT=$PKGNAME test -n "$PROJECT" || PROJECT=$PKGNAME
if [ -d "$TOPDIR" ] ; then if [ -d "$TOPDIR" ] ; then
GEN="genbasedir --create --progress --topdir=$TOPDIR i586 $PROJECT" GEN="genbasedir --create --progress --topdir=$TOPDIR $PLATFORM $PROJECT"
else else
# For NoteBook build # For NoteBook build
TOPDIR=/var/ftp/pub/Ourside/ TOPDIR=/var/ftp/pub/Ourside
GEN=/var/ftp/pub/Ourside/i586/genb.sh GEN=/var/ftp/pub/Ourside/$PLATFORM/genb.sh
fi fi
FTPDIR=$TOPDIR/i586/RPMS.$PROJECT FTPDIR=$TOPDIR/$PLATFORM/RPMS.$PROJECT
BACKUPDIR=$FTPDIR/backup BACKUPDIR=$FTPDIR/backup
fatal() fatal()
...@@ -51,7 +54,7 @@ echo "inform mail sent to $MAILTO" ...@@ -51,7 +54,7 @@ echo "inform mail sent to $MAILTO"
function cp2ftp() function cp2ftp()
{ {
RPMBINDIR=$RPMDIR/RPMS RPMBINDIR=$RPMDIR/RPMS
test -d $RPMBINDIR/i586 && RPMBINDIR=$RPMBINDIR/i586 test -d $RPMBINDIR/$PLATFORM && RPMBINDIR=$RPMBINDIR/$PLATFORM
mkdir -p $BACKUPDIR mkdir -p $BACKUPDIR
mv -f $FTPDIR/*$PKGNAME* $BACKUPDIR/ mv -f $FTPDIR/*$PKGNAME* $BACKUPDIR/
mv -f $RPMBINDIR/*$PKGNAME* $FTPDIR/ mv -f $RPMBINDIR/*$PKGNAME* $FTPDIR/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment