hasufell/ghcup
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change implementation of mktempdir

Browse Source
This commit is contained in:
Julian Ospald 2019-11-13 11:18:54 +08:00
parent 28c8c44574
commit 4f345d109a
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ghcup
View File

@ -1022,16 +1022,15 @@ download_to_stdout() {
# @FUNCTION: mktempdir # @FUNCTION: mktempdir
# @DESCRIPTION: # @DESCRIPTION:
# Makes a temporary directory, placing the path in $tmp_dir. # Makes a temporary directory.
mktempdir() { mktempdir() {
if test "${mydistro}" = "darwin"; then if test "${mydistro}" = "darwin"; then
debug_message "mktemp -d -t ghcup" debug_message "mktemp -d -t ghcup"
tmp_dir=$(mktemp -d -t ghcup) mktemp -d -t ghcup
else else
debug_message "mktemp -d" debug_message "mktemp -d"
tmp_dir=$(mktemp -d) mktemp -d
fi fi
[ -z "${tmp_dir}" ] && die "Failed to create temporary directory"
} }
# @FUNCTION: unpack # @FUNCTION: unpack
@ -1428,7 +1427,8 @@ install_ghc() {
first_install=false first_install=false
fi fi
mktempdir tmp_dir=$(mktempdir)
{ [ -z "${tmp_dir}" ] || ! [ -d "${tmp_dir}" ] ; } && die "Failed to create temporary directory"
( (
if ${CACHING} ; then if ${CACHING} ; then
if [ ! -f "${CACHE_LOCATION}/${download_tarball_name}" ] ; then if [ ! -f "${CACHE_LOCATION}/${download_tarball_name}" ] ; then
@ -1567,8 +1567,7 @@ upgrade() {
status_message "Updating ${SCRIPT}" status_message "Updating ${SCRIPT}"
( (
mktempdir edo cd "$(mktempdir)"
edo cd "${tmp_dir}"
download "${SCRIPT_UPDATE_URL}" download "${SCRIPT_UPDATE_URL}"
edo chmod +x ghcup edo chmod +x ghcup
edo mv -f ghcup "${target_location}"/ghcup edo mv -f ghcup "${target_location}"/ghcup
@ -1693,7 +1692,8 @@ install_cabal() {
edo mkdir -p "${inst_location}" edo mkdir -p "${inst_location}"
mktempdir tmp_dir=$(mktempdir)
{ [ -z "${tmp_dir}" ] || ! [ -d "${tmp_dir}" ] ; } && die "Failed to create temporary directory"
( (
if ${CACHING} ; then if ${CACHING} ; then
if [ ! -f "${CACHE_LOCATION}/${download_tarball_name}" ] ; then if [ ! -f "${CACHE_LOCATION}/${download_tarball_name}" ] ; then
@ -1754,7 +1754,8 @@ compile_ghc() {
fi fi
status_message "Compiling GHC for version ${myghcver} from source" status_message "Compiling GHC for version ${myghcver} from source"
mktempdir tmp_dir=$(mktempdir)
{ [ -z "${tmp_dir}" ] || ! [ -d "${tmp_dir}" ] ; } && die "Failed to create temporary directory"
( (
if ${CACHING} ; then if ${CACHING} ; then
if [ ! -f "${CACHE_LOCATION}/${download_tarball_name}" ] ; then if [ ! -f "${CACHE_LOCATION}/${download_tarball_name}" ] ; then