From 3035e2b46a3ff296c05a60084b3e6cfaa2bc8dc3 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Mon, 24 Mar 2014 09:03:27 +0800
Subject: [PATCH] refine package, add os machine

---
 trunk/scripts/package.sh | 41 +++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/trunk/scripts/package.sh b/trunk/scripts/package.sh
index f5f2d9e1c..afb023629 100755
--- a/trunk/scripts/package.sh
+++ b/trunk/scripts/package.sh
@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/bin/bash
 
-# user can config the following configs, then package.
+# user can config the following configs, then package.
 INSTALL=/usr/local/srs
 
-##################################################################################
-##################################################################################
-##################################################################################
+##################################################################################
+##################################################################################
+##################################################################################
 # discover the current work dir, the log and access.
 echo "argv[0]=$0"
 if [[ ! -f $0 ]]; then 
@@ -26,16 +26,17 @@ ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi
 # check os version
 os_name=`lsb_release --id|awk '{print $3}'` &&
 os_release=`lsb_release --release|awk '{print $2}'` &&
-os_major_version=`echo $os_release|awk -F '.' '{print $1}'`
+os_major_version=`echo $os_release|awk -F '.' '{print $1}'` &&
+os_machine=`uname -m`
 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "lsb_release get os info failed."; exit $ret; fi
-ok_msg "target os is ${os_name}-${os_major_version} ${os_release}"
+ok_msg "target os is ${os_name}-${os_major_version} ${os_release} ${os_machine}"
 
-# build srs
+# build srs
 # @see https://github.com/winlinvip/simple-rtmp-server/wiki/Build
-ok_msg "start build srs"
-(
-    cd $work_dir && 
-    ./configure --with-ssl --with-hls --with-nginx --with-ffmpeg --with-http-callback --prefix=$INSTALL &&
+ok_msg "start build srs"
+(
+    cd $work_dir && 
+    ./configure --with-ssl --with-hls --with-nginx --with-ffmpeg --with-http-callback --prefix=$INSTALL &&
     make && rm -rf $package_dir && make DESTDIR=$package_dir install
 ) >> $log 2>&1
 ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "build srs failed"; exit $ret; fi
@@ -53,18 +54,28 @@ ok_msg "start copy extra files to package"
 ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "copy extra files failed"; exit $ret; fi
 ok_msg "copy extra files success"
 
+# generate zip dir and zip filename
+srs_version=`${build_objs}/srs -v 2>/dev/stdout 1>/dev/null` &&
+zip_dir="SRS-${os_name}${os_major_version}-${os_machine}-${srs_version}"
+ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "generate zip filename failed"; exit $ret; fi
+ok_msg "generate zip filename success"
+
 # zip package.
 ok_msg "start zip package"
 (
-    srs_version=`${build_objs}/srs -v 2>/dev/stdout 1>/dev/null` &&
-    zip_dir="SRS-${os_name}${os_major_version}-${srs_version}" &&
     mv $package_dir ${build_objs}/${zip_dir} &&
-    cd ${build_objs} && zip -q -r ${zip_dir}.zip ${zip_dir} &&
+    cd ${build_objs} && rm -rf ${zip_dir}.zip && zip -q -r ${zip_dir}.zip ${zip_dir} &&
     mv ${build_objs}/${zip_dir} $package_dir
 ) >> $log 2>&1
 ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "zip package failed"; exit $ret; fi
 ok_msg "zip package success"
 
 ok_msg "srs package success"
+echo ""
+echo "package: ${build_objs}/${zip_dir}.zip"
+echo "install:"
+echo "      unzip -q ${zip_dir}.zip &&"
+echo "      cd ${zip_dir} &&"
+echo "      sudo bash INSTALL"
 
 exit 0