Skip to content

Hot fix for fixing bad genesis file on 2.1.5 install #1553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
algojohnlee merged 3 commits into from
Sep 24, 2020
Merged

Hot fix for fixing bad genesis file on 2.1.5 install #1553

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a095f65
Hot fix for fixing bad genesis file on 2.1.5 install
Sep 24, 2020
cc84285
Revert shell back to bourne and remove brace expansions
Sep 24, 2020
c811a31
Added reviewer suggestions
Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion installer/debian/algorand/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash
Comment thread
btoll marked this conversation as resolved.
Outdated

adduser --system --group --home /var/lib/algorand --no-create-home algorand >/dev/null
# prior versions didn't create this group and adduser above won't create it if the algorand user exists
Expand Down Expand Up @@ -35,3 +35,11 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-decon
deb-systemd-invoke $_dh_action algorand.service >/dev/null || true
fi
fi

if [ "$1" = "configure" ]; then
if [ -f /var/lib/algorand/genesis.json-2.1.5-patch ]; then
# 2.1.5 bug fix - restore user-modified genesis.json
mv /var/lib/algorand/genesis.json{-2.1.5-patch,}
Comment thread
btoll marked this conversation as resolved.
Outdated
fi
fi

44 changes: 31 additions & 13 deletions installer/debian/algorand/preinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,45 @@ set -e

PKG_NAME=@PKG_NAME@

if [ "$1" != install ]
if [ "$1" = install ]
then
exit 0
if dpkg-query --list 'algorand*' &> /dev/null
then
if PKG_INFO=$(dpkg-query --show --showformat='${Package} ${Status}\n' 'algorand*' | grep "install ok installed")
then
# Filter out `algorand-indexer` and `algorand-devtools` packages, they are allowed to be
# installed alongside other `algorand` packages.
INSTALLED_PKG=$(grep -v -e algorand-indexer -e algorand-devtools <<< "$PKG_INFO" | awk '{print $1}')

if [ -n "$INSTALLED_PKG" ]
then
echo -e "\nAlgorand does not currently support multi-distribution installations!\n\
To install this package, it is necessary to first remove the \`$INSTALLED_PKG\` package:\n\n\
sudo apt-get remove $INSTALLED_PKG\n\
sudo apt-get install $PKG_NAME\n"
exit 1
fi
fi
fi
fi

if dpkg-query --list 'algorand*' &> /dev/null
if [ "$1" = upgrade ]
then
if PKG_INFO=$(dpkg-query --show --showformat='${Package} ${Status}\n' 'algorand*' | grep "install ok installed")
if [ -f /var/lib/algorand/genesis.json ]
then
# Filter out `algorand-indexer` and `algorand-devtools` packages, they are allowed to be
# installed alongside other `algorand` packages.
INSTALLED_PKG=$(grep -v -e algorand-indexer -e algorand-devtools <<< "$PKG_INFO" | awk '{print $1}')
ALGO_MD5=$(md5sum /var/lib/algorand/genesis.json | awk '{print $1}')

@tsachiherman tsachiherman Sep 24, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since you're using pipes, consider using set -o pipefail

@tsachiherman tsachiherman Sep 24, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and then, use export BASHOPTS to export that to the subshell.

@btoll btoll Sep 24, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will fix.

ALGO_TIMESTAMP=$(stat -c %Y /var/lib/algorand/genesis.json)

if [ -n "$INSTALLED_PKG" ]
if [ "$ALGO_MD5" = "9afc34b96a2c4a9f936870cd26ae7873" ]
then
echo -e "\nAlgorand does not currently support multi-distribution installations!\n\
To install this package, it is necessary to first remove the \`$INSTALLED_PKG\` package:\n\n\
sudo apt-get remove $INSTALLED_PKG\n\
sudo apt-get install $PKG_NAME\n"
exit 1
if [[ "$ALGO_TIMESTAMP" != 1600456830 ||
( "$ALGO_TIMESTAMP" = 1600456830 && ! -d /var/lib/algorand/mainnet-v1.0 ) ]]
then
# 2.1.5 bug fix - back up user-modified genesis.json to restore after conffiles
cp -p /var/lib/algorand/genesis.json{,-2.1.5-patch}
fi
fi

fi
fi