diff options
author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-03-10 22:45:18 +0200 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-03-24 01:18:13 +0200 |
commit | 7d9c43916b0600ac4879dfe9793eab807a83ab2b (patch) | |
tree | ec54ed64c9a557b6ea4ad88d31138a02d3e0cd04 /dev-shell | |
parent | cb6c243dc356ef1d46d7ddb96e6ea6ae007c6cca (diff) | |
download | aconf-7d9c43916b0600ac4879dfe9793eab807a83ab2b.tar.bz2 aconf-7d9c43916b0600ac4879dfe9793eab807a83ab2b.tar.xz |
rename ACF2 to Alpine Configurator (aconf)
Diffstat (limited to 'dev-shell')
-rwxr-xr-x | dev-shell | 84 |
1 files changed, 42 insertions, 42 deletions
@@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (c) 2012-2013 Kaarle Ritvanen +# Copyright (c) 2012-2014 Kaarle Ritvanen # See LICENSE file for license details -function _acf_req { - local url=$ACF_URL$1 +function _aconf_req { + local url=$ACONF_URL$1 shift local resp resp=$(curl -s -w $'\n\nStatus: %{response_code}\r\n' \ - ${ACF_Auth_Token:+-H "X-ACF-Auth-Token: $ACF_Auth_Token"} \ - ${ACF_Transaction_ID:+-H "X-ACF-Transaction-ID: $ACF_Transaction_ID"} \ + ${AConf_Auth_Token:+-H "X-AConf-Auth-Token: $AConf_Auth_Token"} \ + ${AConf_Transaction_ID:+-H "X-AConf-Transaction-ID: $AConf_Transaction_ID"} \ "$@" $url) local code=$? @@ -29,32 +29,32 @@ function _acf_req { return 1 } -function _acf_start_req { +function _aconf_start_req { local url=$1 shift local resp - resp=$(_acf_req "$url" "$@" -D /proc/self/fd/1 -o /proc/self/fd/3) + resp=$(_aconf_req "$url" "$@" -D /proc/self/fd/1 -o /proc/self/fd/3) [ $? -eq 0 ] || return - local txn_id=$ACF_Transaction_ID + local txn_id=$AConf_Transaction_ID while read line; do eval export "$line" done < <(echo "$resp" | \ - sed 's/^X-\(ACF-[-A-Za-z]\+\): /\1=/;ta;d;:a;y/-/_/') + sed 's/^X-\(AConf-[-A-Za-z]\+\): /\1=/;ta;d;:a;y/-/_/') - bash --rcfile "$ACF_QD_CLI" - [ $? -eq 254 ] || _acf_req $url -X DELETE + bash --rcfile "$ACONF_DEV_SHELL" + [ $? -eq 254 ] || _aconf_req $url -X DELETE - ACF_Transaction_ID=$txn_id + AConf_Transaction_ID=$txn_id } -if [ "$ACF_Auth_Token" ]; then +if [ "$AConf_Auth_Token" ]; then - if [ "$ACF_Transaction_ID" ]; then + if [ "$AConf_Transaction_ID" ]; then cat >&2 <<EOF -Transaction $ACF_Transaction_ID started +Transaction $AConf_Transaction_ID started Type 'commit' to commit, 'exit' to abort EOF @@ -68,7 +68,7 @@ Available commands: Fetch metadata: meta <path> Start transaction: start EOF - if [ $ACF_Save_Required = 1 ]; then + if [ $AConf_Save_Required = 1 ]; then echo " Save changes persistently: save" >&2 fi cat >&2 <<EOF @@ -78,55 +78,55 @@ Example: put /awall/zone/internet '{"iface": ["eth0"]}' EOF fi - PS1="$ACF_USER@acf2-dev-shell${ACF_Transaction_ID:+($ACF_Transaction_ID)}> " + PS1="$ACONF_USER@aconf-dev-shell${AConf_Transaction_ID:+($AConf_Transaction_ID)}> " - if [ $ACF_Save_Required = 1 ]; then + if [ $AConf_Save_Required = 1 ]; then function save { - if [ "$ACF_Transaction_ID" ]; then + if [ "$AConf_Transaction_ID" ]; then echo "Transaction not committed" >&2 return 1 fi - _acf_req /save -X POST + _aconf_req /save -X POST } fi function start { - _acf_start_req /transaction -X POST + _aconf_start_req /transaction -X POST } function meta { - _acf_req "/meta$1" + _aconf_req "/meta$1" } - function _acf_obj_req { + function _aconf_obj_req { local path=/config$1 shift - _acf_req "$path" "$@" + _aconf_req "$path" "$@" } - function _acf_post_req { - _acf_obj_req "$2" -d "$3" -X $1 + function _aconf_post_req { + _aconf_obj_req "$2" -d "$3" -X $1 } function get { - _acf_obj_req "$1" + _aconf_obj_req "$1" } function put { - _acf_post_req PUT "$@" + _aconf_post_req PUT "$@" } function post { - _acf_post_req POST "$@" + _aconf_post_req POST "$@" } function delete { - _acf_obj_req "$1" -X DELETE + _aconf_obj_req "$1" -X DELETE } function commit { - if [ "$ACF_Transaction_ID" ]; then - if _acf_req /transaction -X PUT; then + if [ "$AConf_Transaction_ID" ]; then + if _aconf_req /transaction -X PUT; then echo Committed >&2 exit 254 fi @@ -138,16 +138,16 @@ EOF else cat >&2 <<EOF -Development shell for ACF2 -Copyright (c) 2012-2013 Kaarle Ritvanen +Development shell for Alpine Configurator +Copyright (c) 2012-2014 Kaarle Ritvanen EOF exec 3>&1 - export ACF_QD_CLI=$0 + export ACONF_DEV_SHELL=$0 - export ACF_URL=http://localhost:8000 - export ACF_USER=`whoami` + export ACONF_URL=http://localhost:8000 + export ACONF_USER=`whoami` PASSWORD= function usage { @@ -166,7 +166,7 @@ EOF ;; -H) shift - ACF_URL=$1 + ACONF_URL=$1 ;; -p) shift @@ -174,7 +174,7 @@ EOF ;; -u) shift - ACF_USER=$1 + ACONF_USER=$1 ;; --) break @@ -188,8 +188,8 @@ EOF echo >&2 fi - ACF_Transaction_ID= + AConf_Transaction_ID= - _acf_start_req /login \ - -d "{\"username\": \"$ACF_USER\", \"password\": \"$PASSWORD\"}" + _aconf_start_req /login \ + -d "{\"username\": \"$ACONF_USER\", \"password\": \"$PASSWORD\"}" fi |