changes
This commit is contained in:
parent
5e1396f124
commit
9350c0c95f
27
.profile
Normal file
27
.profile
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
# set GIT branch in bash
|
||||||
|
parse_git_branch() {
|
||||||
|
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
|
||||||
|
}
|
||||||
|
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(parse_git_branch)\[\033[00m\]\$ '
|
||||||
|
|
||||||
|
# ssh setup
|
||||||
|
SSH_ENV="$HOME/.ssh/agent-environment"
|
||||||
|
function start_agent {
|
||||||
|
echo "Initialising new SSH agent..."
|
||||||
|
/usr/bin/ssh-agent | sed 's/^echo/#echo/' >"$SSH_ENV"
|
||||||
|
echo succeeded
|
||||||
|
chmod 600 "$SSH_ENV"
|
||||||
|
. "$SSH_ENV" >/dev/null
|
||||||
|
/usr/bin/ssh-add;
|
||||||
|
|
||||||
|
ssh-add ~/.ssh/gitea-ssh
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ -f "$SSH_ENV" ]; then
|
||||||
|
. "$SSH_ENV" >/dev/null
|
||||||
|
ps -ef | grep $SSH_AGENT_PID | grep ssh-agent$ >/dev/null || {
|
||||||
|
start_agent
|
||||||
|
}
|
||||||
|
else
|
||||||
|
start_agent
|
||||||
|
fi
|
||||||
4
bin/denv
4
bin/denv
@ -1,13 +1,13 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/../../" &> /dev/null && pwd )
|
ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/../" &> /dev/null && pwd )
|
||||||
|
|
||||||
denv() {
|
denv() {
|
||||||
if [ ! -z $1 ]
|
if [ ! -z $1 ]
|
||||||
then
|
then
|
||||||
if [[ "$1" == "setup" ]]; then
|
if [[ "$1" == "setup" ]]; then
|
||||||
echo "SETUP IS ONLY ALLOWED ONCE AFTER CLOING THE ENVIRONMENT!!!"
|
echo "SETUP IS ONLY ALLOWED ONCE AFTER CLOING THE ENVIRONMENT!!!"
|
||||||
exit 1
|
exit 0
|
||||||
fi
|
fi
|
||||||
$ENV_DIR/$1
|
$ENV_DIR/$1
|
||||||
else
|
else
|
||||||
|
|||||||
12
bin/dexec
12
bin/dexec
@ -10,17 +10,13 @@ denvexec() {
|
|||||||
local DOCKER_COMMAND="$@"
|
local DOCKER_COMMAND="$@"
|
||||||
local ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." &> /dev/null && pwd )
|
local ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." &> /dev/null && pwd )
|
||||||
|
|
||||||
echo "$SYSTEM_DIR"
|
|
||||||
echo "$ENV_DIR"
|
|
||||||
echo "$DOCKER_COMMAND"
|
|
||||||
|
|
||||||
#MAC
|
#MAC
|
||||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||||
docker compose -f "${ENV_DIR}/docker/docker-compose-mac.yml" $COMMAND
|
docker compose -f "${ENV_DIR}/docker/docker-compose-mac.yml" $DOCKER_COMMAND
|
||||||
|
|
||||||
#LINUX
|
#LINUX
|
||||||
elif [[ "$OSTYPE" == "linux-gnu" ]]; then
|
elif [[ "$OSTYPE" == "linux-gnu" ]]; then
|
||||||
docker compose -f "${ENV_DIR}/docker/docker-compose.yml" $COMMAND
|
docker compose -f "${ENV_DIR}/docker/docker-compose.yml" $DOCKER_COMMAND
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "Dieses Skript wird auf deinem Gerät nicht unterstützt"
|
echo "Dieses Skript wird auf deinem Gerät nicht unterstützt"
|
||||||
@ -51,11 +47,11 @@ dexec() {
|
|||||||
|
|
||||||
#MAC
|
#MAC
|
||||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||||
docker compose -f "${ENV_DIR}/systems/{$SYSTEM_DIR}/docker/docker-compose-mac.yml" $COMMAND
|
docker compose -f "${ENV_DIR}/systems/{$SYSTEM_DIR}/docker/docker-compose-mac.yml" $DOCKER_COMMAND
|
||||||
|
|
||||||
#LINUX
|
#LINUX
|
||||||
elif [[ "$OSTYPE" == "linux-gnu" ]]; then
|
elif [[ "$OSTYPE" == "linux-gnu" ]]; then
|
||||||
docker compose -f "${ENV_DIR}/systems/{$SYSTEM_DIR}/docker/docker-compose.yml" $COMMAND
|
docker compose -f "${ENV_DIR}/systems/{$SYSTEM_DIR}/docker/docker-compose.yml" $DOCKER_COMMAND
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "Dieses Skript wird auf deinem Gerät nicht unterstützt"
|
echo "Dieses Skript wird auf deinem Gerät nicht unterstützt"
|
||||||
|
|||||||
@ -17,5 +17,5 @@ for SYSTEM in $ENV_DIR/systems/*/*/ ; do
|
|||||||
local DENV_COMMAND="dexec"
|
local DENV_COMMAND="dexec"
|
||||||
|
|
||||||
echo "$DENV_COMMAND $SYSTEM_CODE $COMMAND"
|
echo "$DENV_COMMAND $SYSTEM_CODE $COMMAND"
|
||||||
$DENV_COMMAND $SYSTEM_CODE $COMMAND
|
#$DENV_COMMAND $SYSTEM_CODE $COMMAND
|
||||||
done
|
done
|
||||||
|
|||||||
7
setup
7
setup
@ -19,12 +19,15 @@ fi
|
|||||||
ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
||||||
|
|
||||||
echo "Setup dev-env..."
|
echo "Setup dev-env..."
|
||||||
|
|
||||||
echo "Adding sourcing of environment commands to .profile"
|
echo "Adding sourcing of environment commands to .profile"
|
||||||
echo "" >> ~/.profile
|
echo "" >> ~/.profile
|
||||||
echo "# denv setup" >> ~/.profile
|
echo "# denv commands setup" >> ~/.profile
|
||||||
echo "source $ENV_DIR/bin/denv" >> ~/.profile
|
echo "source $ENV_DIR/bin/denv" >> ~/.profile
|
||||||
echo "source $ENV_DIR/bin/drun" >> ~/.profile
|
echo "source $ENV_DIR/bin/drun" >> ~/.profile
|
||||||
echo "source $ENV_DIR/bin/dexec" >> ~/.profile
|
echo "source $ENV_DIR/bin/dexec" >> ~/.profile
|
||||||
echo "source $ENV_DIR/bin/git" >> ~/.profile
|
echo "source $ENV_DIR/bin/git" >> ~/.profile
|
||||||
|
|
||||||
source ~/.profile
|
echo "appending dev-env .profile to .profile"
|
||||||
|
echo "" >> ~/.profile
|
||||||
|
cat .profile >> ~/.profile
|
||||||
Loading…
Reference in New Issue
Block a user