Skip to content

Commit 3b64e84

Browse files
committed
Fixed installer bug: https://trello.com/c/5RcOfd3H
Installer tried to always remove a file which was only created when doing a remote install. This was harmless, but caused a message, and since it did it with sudo, didn't work in the test environment.
1 parent 93adf71 commit 3b64e84

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

buildtools/installme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ PRERELURL=$ROOTURL/Prereleases
4444
SRCROOT=https://github.com/assimilation/assimilation-official/raw
4545
NEOVERS=2.2.5
4646
BUILDLOG=build.out
47+
TARBALL=''
4748

4849
DEBIAN_BASE_CMA_PKGS='python-pip python-flask lsof python-netaddr
4950
resource-agents
@@ -1308,7 +1309,7 @@ fi
13081309

13091310
TMPDIR=$(mktmpdir)
13101311
cd $TMPDIR
1311-
trap 'cd /; rm -fr ${TMPDIR}; $LOCALSUDO rm -f ${TARBALL}' 0
1312+
trap 'cd /; rm -fr ${TMPDIR}' 0
13121313
case $1 in
13131314
cma|nanoprobe)
13141315
echo "Installing release $REL of Assimilation $1 on $(uname -n)"
@@ -1318,6 +1319,7 @@ case $1 in
13181319
test $LOGME = false || loginstall $1
13191320
;;
13201321
remote)
1322+
trap 'cd /; rm -fr ${TMPDIR}; $LOCALSUDO rm -f ${TARBALL}' 0
13211323
shift
13221324
printf 'Performing remote installation of %s on: [%s]\n' "$REL" "$*"
13231325
remote_nano_install "$@"

docfiles/Releases.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
@subsection BugFixes_1_1_1 Bug Fixes
88
- Fixed notification API filter code - https://trello.com/c/RFpMIIhP
99
- Fixed switch discovery - https://trello.com/c/ZJacf7EI
10+
- Fixed installer to not remove file that doesn't exist - https://trello.com/c/5RcOfd3H
1011
@subsection Caveats_1_1_1 Caveats
1112
- Not compatible with database formats before 1.1.0
1213
- Sudoers discovery is disabled for this release - will reappear later on

0 commit comments

Comments
 (0)