Skip to content
Snippets Groups Projects
Verified Commit 4f345d10 authored by Julian Ospald's avatar Julian Ospald :tea:
Browse files

Change implementation of mktempdir

parent 28c8c445
Branches jospald/mktempdir
No related tags found
1 merge request!126mktempdir
...@@ -1022,16 +1022,15 @@ download_to_stdout() { ...@@ -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() { ...@@ -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() { ...@@ -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() { ...@@ -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() { ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment