git.iko.soy/grenade
on master help sign in
Upgrade mafia
9f2f704Erik de Castro Lopo
mafia+12−4
compare with master
unifiedsplit
@@ -67,11 +67,9 @@ exec_mafia () {
67
67
68 # Create a temporary file in MAFIA_BIN so we can do an atomic copy/move dance.
68 # Create a temporary file in MAFIA_BIN so we can do an atomic copy/move dance.
69 mkdir -p $MAFIA_BIN
69 mkdir -p $MAFIA_BIN
70− MAFIA_PATH_TEMP=$(mktemp --tmpdir=$MAFIA_BIN $MAFIA_FILE-XXXXXX 2>/dev/null || TMPDIR=$MAFIA_BIN mktemp -t $MAFIA_FILE)
71
70
72 clean_up () {
71 clean_up () {
73 rm -rf "$MAFIA_TEMP"
72 rm -rf "$MAFIA_TEMP"
74− rm -f "$MAFIA_PATH_TEMP"
75 }
73 }
76
74
77 trap clean_up EXIT
75 trap clean_up EXIT
@@ -87,9 +85,19 @@ exec_mafia () {
87
85
88 bin/bootstrap ) || exit $?
86 bin/bootstrap ) || exit $?
89
87
88+ MAFIA_PATH_TEMP=$(mktemp --tmpdir=$MAFIA_BIN $MAFIA_FILE-XXXXXX 2>/dev/null || TMPDIR=$MAFIA_BIN mktemp -t $MAFIA_FILE)
89+
90+ clean_up_temp () {
91+ clean_up
92+ rm -f "$MAFIA_PATH_TEMP"
93+ }
94+ trap clean_up_temp EXIT
95+
90 cp "$MAFIA_TEMP/mafia/.cabal-sandbox/bin/mafia" "$MAFIA_PATH_TEMP"
96 cp "$MAFIA_TEMP/mafia/.cabal-sandbox/bin/mafia" "$MAFIA_PATH_TEMP"
91− chmod +x "$MAFIA_PATH_TEMP"
97+ chmod 755 "$MAFIA_PATH_TEMP"
92 mv "$MAFIA_PATH_TEMP" "$MAFIA_PATH"
98 mv "$MAFIA_PATH_TEMP" "$MAFIA_PATH"
99+
100+ clean_up_temp
93 }
101 }
94
102
95 exec $MAFIA_PATH "$@"
103 exec $MAFIA_PATH "$@"
@@ -110,4 +118,4 @@ case "$MODE" in
110upgrade) shift; run_upgrade "$@" ;;
118upgrade) shift; run_upgrade "$@" ;;
111*) exec_mafia "$@"
119*) exec_mafia "$@"
112esac
120esac
113−# Version: d64cd4f4ab42c1431752d7c84e355b7d001778f8
121+# Version: dbbe635d8f98be1815130f04465c155f414985bf