diff options
| author | Rob Austein <sra@hactrn.net> | 2011-01-28 21:28:37 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-01-28 21:28:37 +0000 |
| commit | 51baf902ae819dfbcf69abb002e1462fd8bb22aa (patch) | |
| tree | 5b6c44d9e52f35438ff0c901b7af89116f198374 /rcynic/installation-scripts/linux | |
| parent | 56f544af4013fab6d6b279289d61a29ae1e9f6f6 (diff) | |
Whack this into working on Ubuntu 10.04
svn path=/configure; revision=3672
Diffstat (limited to 'rcynic/installation-scripts/linux')
| -rw-r--r-- | rcynic/installation-scripts/linux/install.sh.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rcynic/installation-scripts/linux/install.sh.in b/rcynic/installation-scripts/linux/install.sh.in index da1838c5..ca3fda61 100644 --- a/rcynic/installation-scripts/linux/install.sh.in +++ b/rcynic/installation-scripts/linux/install.sh.in @@ -11,6 +11,7 @@ : ${setupcron="YES"} AWK='@AWK@' +SORT='@SORT@' echo "Setting up \"${jaildir}\" as a chroot jail for rcynic." @@ -127,7 +128,7 @@ do closure="$(/usr/bin/ldd ${shared_libraries} | ${AWK} -v "rcynic=${jaildir}/bin/rcynic" -v "rsync=${jaildir}/bin/rsync" \ '{sub(/:$/, "")} $0 == rcynic || $0 == rsync {next} {for (i = 1; i <= NF; i++) if ($i ~ /^\//) print $i}' | - /bin/sort -u)" + ${SORT} -u)" if test "x$shared_libraries" = "x$closure" then break @@ -141,7 +142,8 @@ do if test -r "${jaildir}/${shared}" then echo "You already have a \"${jaildir}${shared}\", so I will use it" - elif /usr/bin/install -m 555 -o root -g root -p "${shared}" "${jaildir}${shared}" + elif /usr/bin/install -m 555 -o root -g root -d "${jaildir}${shared%/*}" && + /usr/bin/install -m 555 -o root -g root -p "${shared}" "${jaildir}${shared}" then echo "Copied ${shared} into ${jaildir}" else |