Browse Source

Something wrong with Mono

msmith-techempower 10 years ago
parent
commit
1c44218ac8

+ 2 - 7
frameworks/CSharp/aspnet/setup_nginx.sh

@@ -1,11 +1,6 @@
 #!/bin/bash
 
-set -e
-
-# mono environment variables
-. ${IROOT}/mono.installed
-
-export NGINX_HOME=${IROOT}/nginx
+fw_depends nginx mono xsp
 
 sed -i 's|localhost|'"$DBHOST"'|g' src/Web.config
 
@@ -29,7 +24,7 @@ done
 conf+="}"
 echo -e $conf > $TROOT/nginx.upstream.conf
 
-$NGINX_HOME/sbin/nginx -c $TROOT/nginx.conf -g "worker_processes ${MAX_THREADS};"
+nginx -c $TROOT/nginx.conf -g "worker_processes ${MAX_THREADS};"
 
 # To debug, use --printlog --verbose --loglevels=All
 for port in $(seq $port_start $port_end); do

+ 11 - 17
toolset/setup/linux/languages/mono.sh

@@ -1,13 +1,9 @@
 #!/bin/bash
 
-set -ex
-
 RETCODE=$(fw_exists $IROOT/mono.installed)
 [ ! "$RETCODE" == 0 ] || { \
-  echo "Installing RootCAs from Mozilla..."; 
   # Load environment variables
-  . $IROOT/mono.installed
-  mozroots --import --sync;
+  source $IROOT/mono.installed
   return 0; }
 
 # what do we want? latest mono
@@ -25,17 +21,15 @@ SNAPSHOT=$(apt-cache search 'mono-snapshot-.*-assemblies' | cut -d'-' -f3 | tail
 # save environment
 
 echo "export SNAPDATE=$SNAPSHOT" > $IROOT/mono.installing
-cat >> $IROOT/mono.installing <<'END'
-export MONO_HOME=$IROOT/mono-snapshot-$SNAPDATE
-export MONO_PATH=$MONO_HOME/lib/mono/4.5
-export MONO_CFG_DIR=$MONO_HOME/etc
-export PATH=$MONO_HOME/bin:$PATH
-export LD_LIBRARY_PATH=$MONO_HOME/lib:$LD_LIBRARY_PATH
-export PKG_CONFIG_PATH=$MONO_HOME/lib/pkgconfig:$PKG_CONFIG_PATH
-END
+echo "export MONO_HOME=$IROOT/mono-snapshot-$SNAPDATE" >> $IROOT/mono.installing
+echo "export MONO_PATH=$MONO_HOME/lib/mono/4.5" >> $IROOT/mono.installing
+echo "export MONO_CFG_DIR=$MONO_HOME/etc" >> $IROOT/mono.installing
+echo -e "export PATH=$MONO_HOME/bin:\$PATH" >> $IROOT/mono.installing
+echo -e "export LD_LIBRARY_PATH=$MONO_HOME/lib:\$LD_LIBRARY_PATH" >> $IROOT/mono.installing
+echo -e "export PKG_CONFIG_PATH=$MONO_HOME/lib/pkgconfig:\$PKG_CONFIG_PATH" >> $IROOT/mono.installing
 
 # load environment
-. $IROOT/mono.installing
+source $IROOT/mono.installing
 
 # start fresh
 rm -rf $MONO_HOME && mkdir -p $MONO_HOME
@@ -49,8 +43,8 @@ mv $MONO_HOME/opt/mono-*/* $MONO_HOME
 file $MONO_HOME/bin/* | grep "POSIX shell script" | awk -F: '{print $1}' | xargs sed -i "s|/opt/mono-$SNAPDATE|$MONO_HOME|g"
 sed -i "s|/opt/mono-$SNAPDATE|$MONO_HOME|g" $MONO_HOME/lib/pkgconfig/*.pc $MONO_HOME/etc/mono/config
 
-# import SSL certificates
-mozroots --import --sync
-#echo -e 'y\ny\ny\n' | certmgr -ssl https://nuget.org
+echo "mozroots --import --sync" >> $IROOT/mono.installing
 
 mv $IROOT/mono.installing $IROOT/mono.installed
+
+source $IROOT/mono.installed

+ 5 - 8
toolset/setup/linux/languages/xsp.sh

@@ -1,22 +1,19 @@
 #!/bin/bash
 
-set -e
-
 RETCODE=$(fw_exists ${IROOT}/xsp.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/xsp.installed
+  return 0; }
 
 fw_depends mono
 
-# mono environment variables
-. ${IROOT}/mono.installed
-
 # get
 git clone git://github.com/mono/xsp
 cd xsp
 git checkout e272a2c006211b6b03be2ef5bbb9e3f8fefd0768
 
 # build
-./autogen.sh --prefix=${MONO_HOME} --disable-docs
+./autogen.sh --prefix=$MONO_HOME --disable-docs
 make
 make install
 
@@ -24,4 +21,4 @@ make install
 cd ..
 rm -rf xsp
 
-touch ${IROOT}/xsp.installed
+echo "" > $IROOT/xsp.installed