dot

packages and services management
Log | Files | Refs | README

commit 40171e6111db703f0843bebde15ce79cfdacaf7a
parent 8e441ea3fc096306cfec728d6f1855ca153c08bc
Author: Josuah Demangeon <josuah.demangeon@gandi.net>
Date:   Sat,  3 Jun 2017 11:44:08 +0200

fixed profile sourcing

Diffstat:
M.profile | 62+++++++++++++++++++++++++++++---------------------------------
Mprofile | 44+++++++++++++++++++-------------------------
Dpython/build | 2--
Dpython/url | 1-
Dqemu/url | 1-
Dtor-browser/url | 1-
6 files changed, 48 insertions(+), 63 deletions(-)

diff --git a/.profile b/.profile @@ -1,43 +1,39 @@ -# build packages +. "$HOME/etc/profile" -export ROOT="$HOME/.local" -export OPT="$HOME/opt" -export SRC="$HOME/src" -export ETC="$HOME/etc" -export GIT="$HOME/git" -export VAR="$HOME/var" +# info -export IRC="$VAR/irc" -export MAIL="$VAR/mail/INBOX" -export MUSIC="$VAR/music" +export NAME='Josuah Demangeon' +export NICK='josuah' +export EMAIL='mail@josuah.net' +export TZ='Europe/Paris' -# libraries +# default commands -export PATH="$ROOT/bin:$PATH" -export LIBPATH="$ROOT/lib:$LIBPATH" -export MANPATH="$MANPATH:/man:/share/man:/usr/share/man:$ROOT/man" -export LD_RUN_PATH="$ROOT/lib:$LD_RUN_PATH" -export LD_LIBRARY_PATH="$ROOT/lib:$LD_LIBRARY_PATH" +export EDITOR='mg' +export VISUAL='mg' +export PAGER='less' +export MANPAGER='less' +export BROWSER='firefox' +export TERM=vt200 -# deduplicate variables -export PATH=$( - printf %s "$PATH" | - awk -v RS=':' -v ORS=':' '!path[$0] { path[$0] = 1; print; }' | - sed 's/:$//' -) -export MANPATH=$( - printf %s "$MANPATH" | - awk -v RS=':' -v ORS=':' '!path[$0] { path[$0] = 1; print; }' | - sed 's/:$//' -) +# prompts -while IFS='' read -r profile -do - . "$profile" -done << EOF -$(find "$ETC" -type f -name profile) -EOF +export PS1='$(prompt $?)' +export PS2=' ' +export PS3=' ' + + +# startup + +case "$(tty)" in ( /dev/tty* ) + setfont "$ETC/consolefonts/lode-16.psf" + printf '\033]P0000000\033]P7ffddaa\033[J' # color theme + ;; +esac + + +. "$ETC/alias" diff --git a/profile b/profile @@ -1,33 +1,27 @@ -# info +# build packages -export NAME='Josuah Demangeon' -export NICK='josuah' -export EMAIL='mail@josuah.net' -export TZ='Europe/Paris' +export ROOT="$HOME/.local" +export ETC="$HOME/etc" +export OPT="$HOME/opt" +export SRC="$HOME/src" +export GIT="$HOME/git" +export VAR="$HOME/var" -# default commands +export IRC="$VAR/irc" +export MAIL="$VAR/mail/INBOX" +export MUSIC="$VAR/music" -export EDITOR='mg' -export VISUAL='mg' -export PAGER='less' -export MANPAGER='less' -export BROWSER='firefox' -export TERM=vt200 +# libraries +export PATH="$ROOT/bin:$ETC/bin:$PATH" +export LIBPATH="$ROOT/lib:$LIBPATH" +export MANPATH="$MANPATH:/man:/share/man:/usr/share/man:$ROOT/man" +export LD_RUN_PATH="$ROOT/lib:$LD_RUN_PATH" +export LD_LIBRARY_PATH="$ROOT/lib:$LD_LIBRARY_PATH" -# prompts -export PS1='$(prompt $?)' -export PS2=' ' -export PS3=' ' - - -# startup - -case "$(tty)" in ( /dev/tty* ) - setfont "$ETC/consolefonts/lode-16.psf" - printf '\033]P0000000\033]P7ffddaa\033[J' # color theme - ;; -esac +for profile in "$ETC"/*/profile +do . "$profile" +done diff --git a/python/build b/python/build @@ -1,2 +0,0 @@ -OPT= ./configure --prefix="$PREFIX" -OPT= make install diff --git a/python/url b/python/url @@ -1 +0,0 @@ -http://www.python.org/ftp/python/3.6.1/Python-3.6.1.tgz diff --git a/qemu/url b/qemu/url @@ -1 +0,0 @@ -http://download.qemu.org/qemu-2.9.0.tar.xz diff --git a/tor-browser/url b/tor-browser/url @@ -1 +0,0 @@ -http://www.torproject.org/dist/torbrowser/6.5.1/tor-browser-linux64-6.5.1_en-US.tar.xz