From 93805f82377726cb54a71fe8a851fec3b1699553 Mon Sep 17 00:00:00 2001 From: Jakub Zalewski Date: Tue, 28 Feb 2012 04:50:27 +0100 Subject: [PATCH 1/7] hg_prompt_info (similar to git_prompt_info) --- lib/mercurial.zsh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 lib/mercurial.zsh diff --git a/lib/mercurial.zsh b/lib/mercurial.zsh new file mode 100644 index 000000000..4930eab19 --- /dev/null +++ b/lib/mercurial.zsh @@ -0,0 +1,7 @@ +function hg_prompt_info() { + branch=$(hg id -b 2> /dev/null) || return + tag=$(hg id -t 2> /dev/null) || return + rev_number=$(hg id -n 2> /dev/null) || return + rev_id=$(hg id -i 2> /dev/null) || return + echo "${ZSH_THEME_HG_PROMPT_PREFIX}${rev_number/\+/}:${rev_id/\+/}@${branch}(${tag})${ZSH_THEME_HG_PROMPT_SUFFIX}" +} \ No newline at end of file From 2e381bec0452b26edc540c2e4a1e746d667b7bb1 Mon Sep 17 00:00:00 2001 From: Jakub Zalewski Date: Sat, 3 Mar 2012 20:49:30 +0100 Subject: [PATCH 2/7] personal theme --- themes/zalew.zsh-theme | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 themes/zalew.zsh-theme diff --git a/themes/zalew.zsh-theme b/themes/zalew.zsh-theme new file mode 100644 index 000000000..85f33ff60 --- /dev/null +++ b/themes/zalew.zsh-theme @@ -0,0 +1,18 @@ +# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +local user='%{$fg[green]%}%n%{$reset_color%}' +local user_host='%{$fg[green]%}%n@%m%{$reset_color%}' +local current_dir='%{$terminfo[bold]$fg[blue]%} %~%{$reset_color%}' + +local git_branch='$(git_prompt_info)%{$reset_color%}' +local hg_info='$(hg_prompt_info)' + +PROMPT="╭─${user} ${current_dir} ${git_branch}${hg_info} +╰─%B$%b " +RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" +ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX +ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX \ No newline at end of file From 144ef2acce7fb00773bb380b530340e38ac454a8 Mon Sep 17 00:00:00 2001 From: Jakub Zalewski Date: Sat, 3 Mar 2012 21:20:39 +0100 Subject: [PATCH 3/7] install my personal fork --- tools/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install.sh b/tools/install.sh index aedb706da..ed704c7f8 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -5,7 +5,7 @@ then fi echo "\033[0;34mCloning Oh My Zsh...\033[0m" -/usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh +/usr/bin/env git clone https://github.com/zalew/oh-my-zsh.git ~/.oh-my-zsh echo "\033[0;34mLooking for an existing zsh config...\033[0m" if [ -f ~/.zshrc ] || [ -h ~/.zshrc ] From 02b4abbd671f4930d4890c92ef53f63f09cf9d54 Mon Sep 17 00:00:00 2001 From: Jakub Zalewski Date: Wed, 11 Apr 2012 07:24:47 +0200 Subject: [PATCH 4/7] android manifest (package name + android version) --- lib/android.zsh | 31 +++++++++++++++++++++++++++++++ themes/zalew.zsh-theme | 8 ++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 lib/android.zsh diff --git a/lib/android.zsh b/lib/android.zsh new file mode 100644 index 000000000..d9874a3bc --- /dev/null +++ b/lib/android.zsh @@ -0,0 +1,31 @@ +function android_sdk_version() { + sdk=$(xmlstarlet sel -t -v "/manifest/uses-sdk/@android:minSdkVersion" AndroidManifest.xml 2> /dev/null) || return + versions[1]='1.0 Base' + versions[2]='1.1 Base 1.1' + versions[3]='1.5 Cupcake' + versions[4]='1.6 Cupcake' + versions[5]='2.0 Eclair' + versions[6]='2.0.1 Eclair 0.1' + versions[7]='2.1 Eclair MR1' + versions[8]='2.2 Froyo' + versions[9]='2.3.0-2 Gingerbread' + versions[10]='2.3.3-4 Gingerbread MR1' + versions[11]='3.0 Honeycomb' + versions[12]='3.1 Honeycomb MR1' + versions[13]='3.2 Honeycomb MR2' + versions[14]='4.0.0-2 Ice Cream Sandwich' + versions[15]='4.0.0-2 Ice Cream Sandwich MR1' + version=$versions[$sdk] + echo "${version}" +} + +function android_package_name() { + package=$(xmlstarlet sel -t -v "/manifest/@package" AndroidManifest.xml 2> /dev/null) || return + echo "${package}" +} + +function android_prompt_info() { + if (android_sdk_version > 0) { + echo "${ZSH_THEME_ANDROID_PROMPT_PREFIX}$(android_package_name) $(android_sdk_version)${ZSH_THEME_ANDROID_PROMPT_SUFFIX}" + } +} \ No newline at end of file diff --git a/themes/zalew.zsh-theme b/themes/zalew.zsh-theme index 85f33ff60..99d26fb97 100644 --- a/themes/zalew.zsh-theme +++ b/themes/zalew.zsh-theme @@ -7,12 +7,16 @@ local current_dir='%{$terminfo[bold]$fg[blue]%} %~%{$reset_color%}' local git_branch='$(git_prompt_info)%{$reset_color%}' local hg_info='$(hg_prompt_info)' +local android_info='$(android_prompt_info)' -PROMPT="╭─${user} ${current_dir} ${git_branch}${hg_info} +PROMPT="╭─${user} ${current_dir} ${android_info}${git_branch}${hg_info} ╰─%B$%b " RPS1="${return_code}" ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX -ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX \ No newline at end of file +ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX + +ZSH_THEME_ANDROID_PROMPT_PREFIX="%{$fg[green]%}‹" +ZSH_THEME_ANDROID_PROMPT_SUFFIX="› %{$reset_color%}" \ No newline at end of file From a2997687ac7f705e71574c07ee0303a9defc81a2 Mon Sep 17 00:00:00 2001 From: Jakub Zalewski Date: Wed, 11 Apr 2012 21:33:39 +0200 Subject: [PATCH 5/7] bugfix > 0 --- lib/android.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/android.zsh b/lib/android.zsh index d9874a3bc..5760f66b9 100644 --- a/lib/android.zsh +++ b/lib/android.zsh @@ -25,7 +25,7 @@ function android_package_name() { } function android_prompt_info() { - if (android_sdk_version > 0) { + if (android_sdk_version) { echo "${ZSH_THEME_ANDROID_PROMPT_PREFIX}$(android_package_name) $(android_sdk_version)${ZSH_THEME_ANDROID_PROMPT_SUFFIX}" } } \ No newline at end of file From 26d120f20332f9c59c925503477fad8d08c688ca Mon Sep 17 00:00:00 2001 From: Jakub Zalewski Date: Wed, 11 Apr 2012 21:46:24 +0200 Subject: [PATCH 6/7] bugfix: now it works properly --- lib/android.zsh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/android.zsh b/lib/android.zsh index 5760f66b9..bc5bed34c 100644 --- a/lib/android.zsh +++ b/lib/android.zsh @@ -15,17 +15,18 @@ function android_sdk_version() { versions[13]='3.2 Honeycomb MR2' versions[14]='4.0.0-2 Ice Cream Sandwich' versions[15]='4.0.0-2 Ice Cream Sandwich MR1' - version=$versions[$sdk] - echo "${version}" + version="$versions[$sdk]" + echo "$version" } function android_package_name() { package=$(xmlstarlet sel -t -v "/manifest/@package" AndroidManifest.xml 2> /dev/null) || return - echo "${package}" + echo "$package" } function android_prompt_info() { - if (android_sdk_version) { + if [ -n "$(android_sdk_version)" ]; then echo "${ZSH_THEME_ANDROID_PROMPT_PREFIX}$(android_package_name) $(android_sdk_version)${ZSH_THEME_ANDROID_PROMPT_SUFFIX}" - } + fi + } \ No newline at end of file From 18aaba74510d9f5d737e89d62c2bf032cac6bf7a Mon Sep 17 00:00:00 2001 From: Jakub Zalewski Date: Thu, 9 Aug 2012 11:38:35 +0200 Subject: [PATCH 7/7] command for simulated dist-upgrade --- plugins/debian/debian.plugin.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh index 16a5d54ca..f1afdbfdc 100644 --- a/plugins/debian/debian.plugin.zsh +++ b/plugins/debian/debian.plugin.zsh @@ -45,6 +45,7 @@ if [[ $use_sudo -eq 1 ]]; then alias ac="sudo $apt_pref clean" alias ad="sudo $apt_pref update" alias adg="sudo $apt_pref update && sudo $apt_pref upgrade" + alias adus="sudo $apt_pref update && sudo $apt_pref-s dist-upgrade" alias adu="sudo $apt_pref update && sudo $apt_pref dist-upgrade" alias afu='sudo apt-file update' alias ag="sudo $apt_pref upgrade"