Changeset 308

Timestamp:

Dec 6, 2010, 7:28:47 PM (14 years ago)

Author:

katerina

Message:

Fix hardcoded temp directory in deployment scripts (ticket #230).

Location:

trunk

Files:

• deploy.sh.in (modified) (3 diffs)
• dsys/comBUILD (modified) (1 diff)
• dsys/comINSTALL (modified) (1 diff)
• dsys/comUNINSTALL (modified) (1 diff)

trunk/deploy.sh.in

@@ -168 +168 @@
 yule_data="@mydataroot@"
 
+# The temporary directory to use. Default is '/tmp', but some
+# sites may mount this 'noexec'.
+#
+temp_dir="/tmp"
+
 #__END_CUT__
 
@@ -219 +224 @@
 export yule_conf
 export yule_data
+export temp_dir
 
 # dialog
@@ -642 +648 @@
     ;;
 
+  --tmpdir | -tmpdir)
+    opt_prev=temp_dir
+    ;;
+  --tmpdir=* | -tmpdir=*)
+    temp_dir="$optarg"; export temp_dir
+    ;;
+
   -o | --logfile | -logfile)
     opt_prev=logfile

trunk/dsys/comBUILD

@@ -70 +70 @@
     fi
 
-    tmpdir=`eval echo "/tmp/sh_${src_version}_${arch}_${format}_$$"`
+    tmpdir=`eval echo "${temp_dir}/sh_${src_version}_${arch}_${format}_$$"`
 
     #---------------------------------------------------------------------

trunk/dsys/comINSTALL

@@ -169 +169 @@
     #---------------------------------------------------------------------
 
-    tmpdir=`eval echo "/tmp/sh_${src_version}_${arch}_${format}_$$"`
+    tmpdir=`eval echo "${temp_dir}/sh_${src_version}_${arch}_${format}_$$"`
 
     if test x"$simulate" = x0

trunk/dsys/comUNINSTALL

@@ -79 +79 @@
     #---------------------------------------------------------------------
 
-    tmpdir=`eval echo "/tmp/sh_${src_version}_${arch}_${format}_$$"`
+    tmpdir=`eval echo "${temp_dir}/sh_${src_version}_${arch}_${format}_$$"`
 
     if test x"$simulate" = x0