diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-07-19 16:29:43 +0200 |
|---|---|---|
| committer | X2go Administrator <x2go-admin@minobo.das-netzwerkteam.de> | 2011-07-19 16:29:43 +0200 |
| commit | fc9a7e145a4b955f811de25946bedebf438e1ca3 (patch) | |
| tree | 32f30bc20bacb6e0dd044a1b2df55af38b7d593d | |
| parent | d079d87d600c82022c2659341662a22c76095611 (diff) | |
| download | buildscripts-fc9a7e145a4b955f811de25946bedebf438e1ca3.tar.gz buildscripts-fc9a7e145a4b955f811de25946bedebf438e1ca3.tar.bz2 buildscripts-fc9a7e145a4b955f811de25946bedebf438e1ca3.zip | |
fix up for x2goserver not building when x2go-build-all-packages was called
| -rwxr-xr-x | bin/x2go-build-all-packages | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/x2go-build-all-packages b/bin/x2go-build-all-packages index 5dda60f..c558783 100755 --- a/bin/x2go-build-all-packages +++ b/bin/x2go-build-all-packages @@ -17,14 +17,14 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -LIB_PACKAGES_HEULER=" +LIB_PACKAGES_HEULER="\ x2go-keyring heuler master\n nxcomp heuler master\n nxcompext heuler master\n nxcompshad heuler master\n python-x2go heuler master\n " -LIB_PACKAGES_MAIN=" +LIB_PACKAGES_MAIN="\ x2go-keyring main master\n nxcomp main build-main\n nxcompext main build-main\n @@ -32,7 +32,7 @@ nxcompshad main build-main\n python-x2go main build-main\n " -APP_PACKAGES_HEULER=" +APP_PACKAGES_HEULER="\ x2goserver heuler master\n x2goagent heuler master\n x2goclient heuler master\n @@ -46,7 +46,7 @@ pyhoca-gui heuler master\n pyhoca-cli heuler master\n x2gothinclient heuler master " -APP_PACKAGES_MAIN=" +APP_PACKAGES_MAIN="\ x2goserver main build-main\n x2goagent main build-main\n x2goclient main build-main\n @@ -65,7 +65,7 @@ COMPONENT=${1:-""} # build the newest code... (nightly-builds) [ "x$COMPONENT" = "xheuler" ] || [ -z $COMPONENT ] && { - echo -e $LIB_PACKAGES_HEULER + $APP_PACKAGES_HEULER | while read pkg comp checkout; do + echo -e $LIB_PACKAGES_HEULER $APP_PACKAGES_HEULER | while read pkg comp checkout; do if [ "x$(basename $0)" = "xx2go-build-all-packages" ]; then x2go-build-package $pkg $comp $checkout elif [ "x$(basename $0)" = "xx2go-upload-all-packages" ]; then @@ -78,7 +78,7 @@ COMPONENT=${1:-""} # build all packages tagged as build-main [ "x$COMPONENT" = "xmain" ] || [ -z $COMPONENT ] && { - echo -e $LIB_PACKAGES_MAIN + $APP_PACKAGES_MAIN | while read pkg comp checkout; do + echo -e $LIB_PACKAGES_MAIN $APP_PACKAGES_MAIN | while read pkg comp checkout; do if [ "x$(basename $0)" = "xx2go-build-all-packages" ]; then x2go-build-package $pkg $comp $checkout elif [ "x$(basename $0)" = "xx2go-upload-all-packages" ]; then |