support shortcut git curl
authorHuaxu Wan <huaxu.wan@intel.com>
Fri, 2 Dec 2011 02:45:48 +0000 (10:45 +0800)
committerHuaxu Wan <huaxu.wan@intel.com>
Fri, 2 Dec 2011 02:54:26 +0000 (10:54 +0800)
data/build.sh
data/packaging.sh

index dcb8a92..0e1025f 100644 (file)
@@ -40,7 +40,12 @@ git status|grep "modified">/dev/null 2>&1 &&echo "Warning: You local changes doe
 
 # Get project name from git url
 git_url=`git config remote.origin.url`
-prj_name=`basename $git_url`
+echo $git_url|grep ^ssh > /dev/null
+if [ $? == 0 ]; then
+    prj_name=`basename $git_url`
+else
+    prj_name=$(echo $git_url|cut -d ':' -f2)
+fi
 
 # tar the local changes
 tar jcf package.tar.bz2 `git ls-files`
@@ -54,7 +59,7 @@ echo "Submiting your changes to build server"
 
 curl -s -u$user:$passwd -Fname=package.tar.bz2 -Ffile0=@package.tar.bz2 -Fjson='{"parameter": [{"name": "package.tar.bz2", "file": "file0"},{"name":"pkg", "value":"'$prj_name'"},{"name":"parameters","value":"obsproject='$target_obsproject';passwdx='$passwdx'"}]}' -FSubmit=Build "$HUDSON_SERVER/job/build/build" 
 
-sleep 0.5
+sleep 1
 last_id=`curl -s -u$user:$passwd "$HUDSON_SERVER/job/build/lastBuild/buildNumber"`
 
 # In case the last commit is not made by the user, supposed the last job triggered by '$user' is the one. 
@@ -79,7 +84,7 @@ do
         break
     fi
     
-    sleep 0.5
+    sleep 1
     if [ -n "$verbose" ]; then
         length=`curl -s -u$user:$passwd "$HUDSON_SERVER/rest/projects/build/$build_id/console/" | cut -d ',' -f2|cut -d ':' -f2`
         curl -s -u$user:$passwd "$HUDSON_SERVER/rest/projects/build/$build_id/console/content" -d 'length'=$length -d 'offset'=$offset -G
index c04951f..1e1a3ff 100644 (file)
@@ -314,8 +314,12 @@ passwd=$(tizenpkg cfg passwd)
 HUDSON_SERVER=$(tizenpkg cfg src_server)
 
 git_url=`git config remote.origin.url`
-project=`basename $git_url`
-
+echo $git_url|grep ^ssh  > /dev/null
+if [ $? == 0 ]; then
+    project=`basename $git_url`
+else
+    project=$(echo $git_url|cut -d ':' -f2)
+fi
 
 info_msg "Packaging at major release ${tag}, the other commit(s) formating as patch(es)"
 srctar_md5sum=""