diff --git a/README.md b/README.md index 924e3b8..04d73f7 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,28 @@ DEBIAN-BASH =========== -quick installation ------------------- +DEBIAN-BASH is a collection of settings and helpers for BASH provided by *Artcode*. Featuring : -`curl https://git.artcode.re/pvincent/debian-bash/raw/master/install.sh | sudo bash` +* some aliases (l, ll, ltr, ...) +* a smart prompt + * git, lxd, failure aware +* simple vim settings -installation ------------- +It's Free Software (GPLv3), help yourself. Any feedback would be appreciated. [contact@artcode.re](mailto:contact@artcode.re) -* wget https://git.artcode.re/pvincent/debian-bash/archive/master.tar.gz -C /opt/debian-bash -* cd /opt/debian-bash -* sudo ./install.sh +install +------------- + +`curl https://git.artcode.re/pvincent/debian-bash/raw/master/install.sh | sudo bash` uninstall --------- -* cd /opt/debian-bash -* sudo ./uninstall.sh +* `cd /opt/debian-bash && sudo ./uninstall.sh` + +development mode (credentials required) +--------------------------------------- + +* git clone git@artcode.re:pvincent/debian-bash.git +* cd debian-bash +* sudo ./install.sh diff --git a/bash.bashrc b/bash.bashrc index ffd599b..80ef89c 100644 --- a/bash.bashrc +++ b/bash.bashrc @@ -141,7 +141,7 @@ DEBIAN_BASH_DIR=/opt/debian-bash alias ls='ls $COLOR_OPTIONS' alias ll='ls $COLOR_OPTIONS -l' alias lh='ls $COLOR_OPTIONS -lh' -alias la='ls $COLOR_OPTIONS -lA' +alias la='ls $COLOR_OPTIONS -la' alias ltr='ls $COLOR_OPTIONS -ltrh' alias l=ls @@ -161,8 +161,9 @@ if [ -f ~/.bash_aliases ]; then . ~/.bash_aliases fi -PATH=$PATH:/opt/debian-bash/tools - -if [ -d /opt/debian-server ]; then - PATH=$PATH:/opt/debian-server/tools -fi +# Add path to any tools folder in /opt/debian-* +for i in {/opt,$HOME}/debian-*/tools; do + if [ -d "$i" ]; then + PATH=$PATH:$i + fi +done diff --git a/install.sh b/install.sh index 1afa413..6baefcc 100755 --- a/install.sh +++ b/install.sh @@ -5,7 +5,7 @@ BASEDIR=$PWD if [[ ! $BASEDIR == '/opt/debian-bash' ]]; then - # download and filfull /etc/debian-bash, then run it from folder + # download and filfull /opt/debian-bash, then run it from folder rm -rf /opt/debian-bash TEMP=`mktemp -d` diff --git a/tools/video_concat b/tools/video_concat deleted file mode 100755 index 5cac282..0000000 --- a/tools/video_concat +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# should be run through output pipe, exit otherwise -[ -t 1 ] && echo "ERROR: should declare output as a pipe, ie > output.mp4" && exit -1 - -# detect current dir -DIR=$(pwd) - -# build temporary file which contains all the files to append -tempfile=$(mktemp) -for i in $@; do - echo file $DIR/$i >> $tempfile -done - -# output as matroska file -ffmpeg -safe 0 -f concat -i $tempfile -c copy -f matroska -