summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2009-03-21 12:47:33 +0100
committerDaniel Friesel <derf@derf.homelinux.org>2009-03-21 12:47:33 +0100
commit11fc1ffd3d33cf511ec7b0bef7c5e9ed58e9309d (patch)
treef9128ffd03e0157e4192955752bd25b59ad4ede2
parentb21a30a7c0f20993d41a3a45c17623b799a13b46 (diff)
Removed etc/colors
-rw-r--r--etc/colors9
-rw-r--r--etc/functions/die2
-rwxr-xr-xetc/functions/extr2
-rw-r--r--etc/functions/fdie2
-rw-r--r--etc/functions/info2
-rw-r--r--etc/functions/warn2
-rw-r--r--etc/rc5
7 files changed, 7 insertions, 17 deletions
diff --git a/etc/colors b/etc/colors
deleted file mode 100644
index 30ca468..0000000
--- a/etc/colors
+++ /dev/null
@@ -1,9 +0,0 @@
-## Colors
-## vim:ft=zsh
-fail=$'\e[1;31m'
-warn=$'\e[1;33m'
-info=$'\e[0;36m'
-yellow=$'\e[0;33m'
-green=$'\e[0;32m'
-red=$'\e[0;31m'
-reset=$'\e[0m'
diff --git a/etc/functions/die b/etc/functions/die
index 5792d4b..6bee0a8 100644
--- a/etc/functions/die
+++ b/etc/functions/die
@@ -1,3 +1,3 @@
## vim:ft=zsh
-echo -e "${fail}${*}${reset}" > /dev/stderr
+echo -e "\e[1;31m${*}\e[0m" > /dev/stderr
exit 1
diff --git a/etc/functions/extr b/etc/functions/extr
index 4f0100d..f335dc6 100755
--- a/etc/functions/extr
+++ b/etc/functions/extr
@@ -2,7 +2,7 @@
## vim:ft=zsh
function confirm_shar {
- echo -ne "${warn}shar archives are shell scripts and can easily contain malicious code.${reset} Proceed? [y/N] "
+ echo -ne "\e[1;33mshar archives are shell scripts and can easily contain malicious code.\e[0m Proceed? [y/N] "
read -q
}
diff --git a/etc/functions/fdie b/etc/functions/fdie
index e96aeef..2cbda7a 100644
--- a/etc/functions/fdie
+++ b/etc/functions/fdie
@@ -1,3 +1,3 @@
## vim:ft=zsh
-echo -e "${fail}${*}${reset}" > /dev/stderr
+echo -e "\e[1;31m${*}\e[0m" > /dev/stderr
return 1
diff --git a/etc/functions/info b/etc/functions/info
index b04951c..00a3a63 100644
--- a/etc/functions/info
+++ b/etc/functions/info
@@ -1 +1 @@
-echo -e "${info}${*}${reset}"
+echo -e "\e[0;36m${*}\e[0m"
diff --git a/etc/functions/warn b/etc/functions/warn
index 4180025..789a9ef 100644
--- a/etc/functions/warn
+++ b/etc/functions/warn
@@ -1,2 +1,2 @@
## vim:ft=zsh
-echo -e "${warn}${*}${reset}" > /dev/stderr
+echo -e "\e[1;33m${*}\e[0m" > /dev/stderr
diff --git a/etc/rc b/etc/rc
index 2cdf069..266ee41 100644
--- a/etc/rc
+++ b/etc/rc
@@ -15,15 +15,14 @@ if [[ $system == linux ]] {
}
function zrc_status {
- echo -n "\r\e[2K${info}--${reset} $*"
+ echo -n "\r\e[2K\e[0;36m--\e[0m $*"
}
function zrc_info {
- echo "${info}--${reset} $*"
+ echo "\e[0;36m--\e[0m $*"
}
# include the actual config
source $ZDIR/options
-source $ZDIR/colors
source $ZDIR/parameters
source $ZDIR/function
source $ZDIR/zle