diff --git a/build.sh b/build.sh index 7187b91..eeee4e3 100755 --- a/build.sh +++ b/build.sh @@ -2,16 +2,15 @@ set -e : "${BITCARTGEN_DOCKER_IMAGE:=bitcartcc/docker-compose-generator}" -if [ "$BITCARTGEN_DOCKER_IMAGE" == "bitcartcc/docker-compose-generator:local" ] -then +if [ "$BITCARTGEN_DOCKER_IMAGE" == "bitcartcc/docker-compose-generator:local" ]; then docker build generator --tag $BITCARTGEN_DOCKER_IMAGE else set +e docker pull $BITCARTGEN_DOCKER_IMAGE - docker rmi $(docker images bitcartcc/docker-compose-generator --format "{{.Tag}};{{.ID}}" | grep "^" | cut -f2 -d ';') > /dev/null 2>&1 + docker rmi $(docker images bitcartcc/docker-compose-generator --format "{{.Tag}};{{.ID}}" | grep "^" | cut -f2 -d ';') >/dev/null 2>&1 set -e fi docker run -v "$PWD/compose:/app/compose" \ --env-file <(env | grep BITCART_) \ - --rm $BITCARTGEN_DOCKER_IMAGE \ No newline at end of file + --rm $BITCARTGEN_DOCKER_IMAGE diff --git a/changedomain.sh b/changedomain.sh index 180c72f..7079f6f 100755 --- a/changedomain.sh +++ b/changedomain.sh @@ -18,4 +18,4 @@ export BITCART_HOST="$NEW_HOST" bitcart_update_docker_env apply_local_modifications -bitcart_start \ No newline at end of file +bitcart_start diff --git a/cleanup.sh b/cleanup.sh index beef0fd..cbed439 100755 --- a/cleanup.sh +++ b/cleanup.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker image prune -af --filter "label=org.bitcartcc.image" --filter "label!=org.bitcartcc.image=docker-compose-generator" \ No newline at end of file +docker image prune -af --filter "label=org.bitcartcc.image" --filter "label!=org.bitcartcc.image=docker-compose-generator" diff --git a/compose/scripts/docker-entrypoint.sh b/compose/scripts/docker-entrypoint.sh index 0cbc2c1..058f32a 100755 --- a/compose/scripts/docker-entrypoint.sh +++ b/compose/scripts/docker-entrypoint.sh @@ -4,22 +4,22 @@ set -ex # BitcartCC is configuring current instance or updating it via SSH access # Make host.docker.internal work (on linux-based docker engines) -echo "$(/sbin/ip route|awk '/default/ { print $3 }') host.docker.internal" >> /etc/hosts +echo "$(/sbin/ip route | awk '/default/ { print $3 }') host.docker.internal" >>/etc/hosts if [ ! -z "$SSH_KEY_FILE" ] && ! [ -f "$SSH_KEY_FILE" ]; then echo "Creating BitcartCC SSH key File..." - ssh-keygen -t rsa -f "$SSH_KEY_FILE" -q -P "" -m PEM -C bitcartcc > /dev/null + ssh-keygen -t rsa -f "$SSH_KEY_FILE" -q -P "" -m PEM -C bitcartcc >/dev/null if [ -f "$SSH_AUTHORIZED_KEYS" ]; then # Because the file is mounted, sed -i does not work - sed '/bitcartcc$/d' "$SSH_AUTHORIZED_KEYS" > "$SSH_AUTHORIZED_KEYS.new" - cat "$SSH_AUTHORIZED_KEYS.new" > "$SSH_AUTHORIZED_KEYS" + sed '/bitcartcc$/d' "$SSH_AUTHORIZED_KEYS" >"$SSH_AUTHORIZED_KEYS.new" + cat "$SSH_AUTHORIZED_KEYS.new" >"$SSH_AUTHORIZED_KEYS" rm -rf "$SSH_AUTHORIZED_KEYS.new" fi fi if [ ! -z "$SSH_KEY_FILE" ] && [ -f "$SSH_AUTHORIZED_KEYS" ] && ! grep -q "bitcartcc$" "$SSH_AUTHORIZED_KEYS"; then echo "Adding BitcartCC SSH key to authorized keys" - cat "$SSH_KEY_FILE.pub" >> "$SSH_AUTHORIZED_KEYS" + cat "$SSH_KEY_FILE.pub" >>"$SSH_AUTHORIZED_KEYS" fi exec "$@" diff --git a/helpers.sh b/helpers.sh index f139d74..63618af 100644 --- a/helpers.sh +++ b/helpers.sh @@ -1,8 +1,8 @@ [[ -f ".deploy" ]] && . .deploy bitcart_update_docker_env() { -touch $BITCART_ENV_FILE -cat > $BITCART_ENV_FILE << EOF + touch $BITCART_ENV_FILE + cat >$BITCART_ENV_FILE <> "$HOME/.bash_profile" + echo ". \"$BASH_PROFILE_SCRIPT\"" >>"$HOME/.bash_profile" fi else @@ -99,7 +99,7 @@ remove_host() { add_host() { if [ -z "$(grep -P "[[:space:]]$2" /etc/hosts)" ]; then - try printf "%s\t%s\n" "$1" "$2" | sudo tee -a /etc/hosts > /dev/null + try printf "%s\t%s\n" "$1" "$2" | sudo tee -a /etc/hosts >/dev/null fi } @@ -109,9 +109,9 @@ modify_host() { } apply_local_modifications() { - if [[ "$BITCART_HOST" == *.local ]] ; then + if [[ "$BITCART_HOST" == *.local ]]; then echo "Local setup detected." - if [[ "$BITCART_NOHOSTSEDIT" = true ]] ; then + if [[ "$BITCART_NOHOSTSEDIT" = true ]]; then echo "Not modifying hosts." else echo "WARNING! Modifying /etc/hosts to make local setup work. It may require superuser privileges." @@ -132,7 +132,7 @@ bitcart_dump_db() { if [ ! -d "$backup_dir" ]; then docker volume create backup_datadir fi - docker exec $(container_name "database_1") pg_dumpall -c -U postgres > "$backup_dir/$1" + docker exec $(container_name "database_1") pg_dumpall -c -U postgres >"$backup_dir/$1" } bitcart_restore_db() { diff --git a/load_env.sh b/load_env.sh index 675ba8a..f8881e7 100755 --- a/load_env.sh +++ b/load_env.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash . helpers.sh -load_env \ No newline at end of file +load_env diff --git a/restart.sh b/restart.sh index 3bc6cb0..2a03d25 100755 --- a/restart.sh +++ b/restart.sh @@ -4,4 +4,4 @@ load_env cd "$BITCART_BASE_DIRECTORY" -bitcart_restart \ No newline at end of file +bitcart_restart diff --git a/start.sh b/start.sh index 49a9f61..d730e61 100755 --- a/start.sh +++ b/start.sh @@ -4,4 +4,4 @@ load_env cd "$BITCART_BASE_DIRECTORY" -bitcart_start \ No newline at end of file +bitcart_start diff --git a/stop.sh b/stop.sh index 6a9af68..879eb1c 100755 --- a/stop.sh +++ b/stop.sh @@ -4,4 +4,4 @@ load_env cd "$BITCART_BASE_DIRECTORY" -bitcart_stop \ No newline at end of file +bitcart_stop diff --git a/update.sh b/update.sh index 598aa14..e7bc084 100755 --- a/update.sh +++ b/update.sh @@ -5,7 +5,7 @@ set -e . helpers.sh load_env -export USER_UID=${UID} +export USER_UID=${UID} export USER_GID=${GID} cd "$BITCART_BASE_DIRECTORY" @@ -20,7 +20,7 @@ if ! [ -f "/etc/docker/daemon.json" ] && [ -w "/etc/docker" ]; then echo "{ \"log-driver\": \"json-file\", \"log-opts\": {\"max-size\": \"5m\", \"max-file\": \"3\"} -}" > /etc/docker/daemon.json +}" >/etc/docker/daemon.json echo "Setting limited log files in /etc/docker/daemon.json" fi @@ -35,4 +35,4 @@ bitcart_pull bitcart_start set +e -docker image prune -af --filter "label=org.bitcartcc.image" --filter "label!=org.bitcartcc.image=docker-compose-generator" \ No newline at end of file +docker image prune -af --filter "label=org.bitcartcc.image" --filter "label!=org.bitcartcc.image=docker-compose-generator"