grassrootseconomics/cic-staff-installer
5
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Wiki Activity

feat: Bring in progress output and encryption improvements for clicada #1

Open
lash wants to merge 13 commits from lash/clicada-improved into master
pull from: lash/clicada-improved
merge into: grassrootseconomics:master
Conversation 0 Commits 13 Files Changed 10 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 96994ef3fc - Show all commits

5
setup.sh
View File

@ -13,7 +13,8 @@ PIP_EXTRA_ARGS=$PIP_EXTRA_ARGS
PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net} PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net}
PIP_INDEX_URL=${PIP_INDEX_URL:-"https://pypi.org/simple"} PIP_INDEX_URL=${PIP_INDEX_URL:-"https://pypi.org/simple"}
CIC_SETUP_TRUSTED_FINGERPRINT=${CIC_SETUP_TRUSTED_FINGERPRINT:-0826EDA1702D1E87C6E2875121D2E7BB88C2A746} CIC_SETUP_TRUSTED_FINGERPRINT=${CIC_SETUP_TRUSTED_FINGERPRINT:-0826EDA1702D1E87C6E2875121D2E7BB88C2A746}
CIC_ROOT_URL=${CIC_ROOT_URL:-https://root.grassrootseconomics.net} CIC_ROOT_URL=${CIC_ROOT_URL:-https://root.grassrootseconomics.net/env/dev}
CIC_ROOT_CA_FILE=${CIC_ROOT_CA_FILE:-keys/ge.ca}
if [ "$UID" -eq 0 ]; then if [ "$UID" -eq 0 ]; then
dbg $dbg_error "This cannot be run as root" dbg $dbg_error "This cannot be run as root"
@ -48,7 +49,7 @@ if [ ! -e "$HOME/.config/cic/staff-client/.envinit" ]; then
v=${!c} v=${!c}
if [ -z "$v" ]; then if [ -z "$v" ]; then
d=`mktemp -d` d=`mktemp -d`
curl -X GET $CIC_ROOT_URL/cic-staff-client/$c -o $d/$c curl -X GET --cacert $CIC_ROOT_CA_FILE $CIC_ROOT_URL/$c -o $d/$c
gpg --homedir $HOME/.local/share/cic/.gnupg --verify $d/$c gpg --homedir $HOME/.local/share/cic/.gnupg --verify $d/$c
v=`gpg --homedir $HOME/.local/share/cic/.gnupg -d $d/$c` v=`gpg --homedir $HOME/.local/share/cic/.gnupg -d $d/$c`
echo $v >> $t echo $v >> $t