* Always make source writable.
svn path=/nixpkgs/trunk/; revision=1153
This commit is contained in:
parent
93efdb400a
commit
8b0e40b3d4
@ -185,6 +185,8 @@ startLog() {
|
|||||||
ensureDir $logDir
|
ensureDir $logDir
|
||||||
exec 3>&1
|
exec 3>&1
|
||||||
if test "$dontLogThroughTee" != 1; then
|
if test "$dontLogThroughTee" != 1; then
|
||||||
|
# Put this in an `eval' so that non-bash shells (or bash
|
||||||
|
# invoked as `sh') won't choke on parsing this file.
|
||||||
eval "exec > >(tee $logDir/$logFile) 2>&1"
|
eval "exec > >(tee $logDir/$logFile) 2>&1"
|
||||||
else
|
else
|
||||||
exec > $logDir/$logFile 2>&1
|
exec > $logDir/$logFile 2>&1
|
||||||
@ -227,11 +229,8 @@ unpackFile() {
|
|||||||
*.zip) cmd="unzip $file";;
|
*.zip) cmd="unzip $file";;
|
||||||
*)
|
*)
|
||||||
if test -d "$file"; then
|
if test -d "$file"; then
|
||||||
# Copy directories and add write permission (this is
|
|
||||||
# because such directories are usually in the store
|
|
||||||
# and are this read-only).
|
|
||||||
stripHash $file
|
stripHash $file
|
||||||
cmd="cp -prvd $file $strippedName && chmod -R +w $strippedName"
|
cmd="cp -prvd $file $strippedName"
|
||||||
else
|
else
|
||||||
if test -n "$findUnpacker"; then
|
if test -n "$findUnpacker"; then
|
||||||
$findUnpacker $1;
|
$findUnpacker $1;
|
||||||
@ -310,6 +309,13 @@ unpackW() {
|
|||||||
|
|
||||||
echo "source root is $sourceRoot"
|
echo "source root is $sourceRoot"
|
||||||
|
|
||||||
|
# By default, add write permission to the sources. This is often
|
||||||
|
# necessary when sources have been copied from other store
|
||||||
|
# locations.
|
||||||
|
if test "dontMakeSourcesWritable" != 1; then
|
||||||
|
chmod -R +w $sourceRoot
|
||||||
|
fi
|
||||||
|
|
||||||
if test -n "$postUnpack"; then
|
if test -n "$postUnpack"; then
|
||||||
$postUnpack
|
$postUnpack
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user