[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/icecream/icecream/client
From:       Stephan Kulow <coolo () kde ! org>
Date:       2004-08-23 19:15:48
Message-ID: 20040823191548.48A712545 () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

try to solve symlinks more globally


  M +5 -11     create-env   1.8


--- kdenonbeta/icecream/icecream/client/create-env  #1.7:1.8
@@ -24,4 +24,5 @@
   fi
   test -z "$name" && return
+  path=$(readlink -f $path)
   toadd="$name=$path"
   if test "$name" = "$path"; then
@@ -61,12 +62,4 @@
 fi
 
-if test -L /usr/bin/gcc; then
-  added_gcc=`readlink -f /usr/bin/gcc`
-fi
-
-if test -L /usr/bin/g++; then
-  added_gxx=`readlink -f /usr/bin/g++`
-fi
-
 add_file $added_gcc /usr/bin/gcc 
 add_file $added_gxx /usr/bin/g++
@@ -98,11 +91,12 @@
 # of ordering
 target_files=`for i in $new_target_files; do echo $i; done | sort`
-#echo "adding files $target_files"
-md5=`for i in $tmpdir/$target_files; do md5sum $i; done | sed -e 's/ .*$//' | md5sum \
| sed -e 's/ .*$//'` || { +md5=`for i in $target_files; do md5sum $tmpdir/$i; done | \
sed -e 's/ .*$//' | md5sum | sed -e 's/ .*$//'` || {  echo "Couldn't compute MD5 \
sum."  exit 2
 }
 echo "creating $md5.tar.bz2"
-tar -C $tempdir -cjhf "$md5".tar.bz2 $target_files || {
+mydir=`pwd`
+cd $tempdir
+tar -cjhf "$mydir/$md5".tar.bz2 $target_files || {
   echo "Couldn't create archive"
   exit 3


[prev in list] [next in list] [prev in thread] [next in thread]