git.lirion.de

Of git, get, and gud

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Pfeiffer <coding _ lirion.de> 2022-03-23 20:19:21 +0100
committerHarald Pfeiffer <coding _ lirion.de> 2022-03-23 20:19:21 +0100
commiteca8378796221e58155265713eb9d5c11cd9ea88 (patch)
treea857ea08a969f24cbef4e9c9ea751feb7b7750bf
parentad993fafc2bd05b651b46edf9e12da8d5dec4a99 (diff)
parent56b60c35af0e5ab593aaa124436e6674a1693dab (diff)
downloaddotfiles-eca8378796221e58155265713eb9d5c11cd9ea88.tar.bz2
Merge branch 'testing' of git.lirion.de:/var/cache/git/dotfiles into testing
-rw-r--r--.bash/prompt.bash6
-rw-r--r--Makefile2
2 files changed, 5 insertions, 3 deletions
diff --git a/.bash/prompt.bash b/.bash/prompt.bash
index 734988a..71845d1 100644
--- a/.bash/prompt.bash
+++ b/.bash/prompt.bash
@@ -28,7 +28,8 @@ case "$MYUID" in
# the colour of Geeko:
#*suse|aix) FGC2="fgcolor 22";FGC3="fgcolor 41";;
*sles*) FGC2="fgcolor 22";FGC3="fgcolor 83";;
- *suse|aix) FGC2="fgcolor 30";FGC3="fgcolor 83";;
+ *suse) FGC2="fgcolor 30";FGC3="fgcolor 83";;
+ aix) FGC2="fgcolor 238";FGC3="fgcolor 83";;
*centos*) FGC2="fgcolor 25";FGC3="fgcolor 208";;
*solaris) FGC2="fgcolor 31";FGC3="fgcolor 124";;
ubuntu) FGC2="fgcolor 130";FGC3="fgcolor 215";;
@@ -45,7 +46,8 @@ case "$MYUID" in
redhat|fedora) FGC1="fgcolor 88";FGC3="fgcolor 203";;
#*suse|aix) FGC1="fgcolor 22";FGC3="fgcolor 41";;
*sles*) FGC1="fgcolor 22";FGC3="fgcolor 83";;
- *suse|aix) FGC1="fgcolor 30";FGC3="fgcolor 83";;
+ *suse) FGC1="fgcolor 30";FGC3="fgcolor 83";;
+ aix) FGC1="fgcolor 238";FGC3="fgcolor 83";;
*centos*) FGC1="fgcolor 25";FGC3="fgcolor 208";;
*solaris) FGC1="fgcolor 31";FGC3="fgcolor 124";;
ubuntu) FGC1="fgcolor 130";FGC3="fgcolor 215";;
diff --git a/Makefile b/Makefile
index e283aa1..37bae6d 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ all: complete
complete: checkenv tempdirs tarball removedirs distrib removetar
tarball:
- rsync -avu bin .bash .bash_profile .bashrc .flake8 .gitconfig .gnupg .perlcriticrc .profile .pylintrc .tmux.conf .tmux.conf.local tmux-gpakosz tmux-yank .vimrc --exclude=.git --exclude=.gitattributes --exclude=.github --exclude=.gitignore --exclude='LICENSE*' --exclude='README*' distribute/tar/
+ rsync -avu bin .bash .bash_profile .bashrc .flake8 .gitconfig .gnupg .perlcriticrc .profile .pylintrc .tmux.conf .tmux.conf.local tmux-gpakosz tmux-yank .vimrc --exclude=.git --exclude=.gitattributes --exclude=.github --exclude=.gitignore --exclude='LICENSE*' --exclude='README*' --exclude='*.local' distribute/tar/
tar -C distribute/tar -cvJf dotfiles.tar.xz .
rm -rf distribute/tar