Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: marshall/dotfiles
base: 6c406a8896
...
head fork: marshall/dotfiles
compare: a981de494b
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 9 files changed
  • 0 commit comments
  • 1 contributor
View
3  .gitmodules
@@ -34,3 +34,6 @@
[submodule "vim/vim.symlink/bundle/vim-markdown"]
path = vim/vim.symlink/bundle/vim-markdown
url = git://github.com/tpope/vim-markdown.git
+[submodule "vim/vim.symlink/bundle/vim-gitgutter"]
+ path = vim/vim.symlink/bundle/vim-gitgutter
+ url = https://github.com/airblade/vim-gitgutter
View
9 ack/ackrc.symlink
@@ -2,6 +2,10 @@
--type-set
idl=.idl
+# IPDL file
+--type-set
+ipdl=.ipdl
+
# JSM (javascript module) files
--type-set
jsm=.jsm
@@ -18,8 +22,13 @@ webapp=.webapp
--type-set
manifest=.manifest
+# SASS scss
+--type-set
+scss=.scss
+
# Ignore dirs
--ignore-dir=objdir-b2g_desktop
--ignore-dir=objdir-otoro
--ignore-dir=objdir-generic
--ignore-dir=objdir-crespo
+--ignore-dir=xulrunner-sdk
View
12 logcat-color/logcat-color.symlink
@@ -34,7 +34,8 @@ class B2GProfile(Profile):
# forms.js loaded
negated_regex(r"forms.js loaded"),
# tags we don't care about
- lambda data: data.get("tag") not in self.IGNORE_TAGS
+ lambda data: data.get("tag") not in self.IGNORE_TAGS,
+ lambda data: "-*- SettingsManager" not in data.get("message")
)
B2GProfile(name = "ril",
@@ -67,3 +68,12 @@ def otoroFilter(data):
B2GProfile(name = "otoro", device = "full_otoro", filters = (otoroFilter, ))
B2GProfile(name = "unagi", device = "full_unagi", filters = (otoroFilter, ))
B2GProfile(name = "nexus-s", device = "39318E867DC300EC")
+
+def settingsFilter(data):
+ message = data.get("message")
+ if not message:
+ return False
+
+ return message.startswith("-*- Settings")
+
+B2GProfile(name = "settings", filters = (otoroFilter, settingsFilter))
View
18 mozilla/b2g.zsh
@@ -21,9 +21,14 @@ b2g_test_local_update() {
}
b2g_push_busybox() {
- adb $@ shell 'mkdir -p /data/busybox/busybox'
- adb $@ push $B2G_DEV_DIR/gaia/build/busybox-armv6l /data/busybox/busybox-bin
- adb $@ shell 'chmod 755 /data/busybox/busybox-bin'
+ adb $@ remount
+ adb $@ push $B2G_DEV_DIR/gaia/build/busybox-armv6l /system/bin/busybox
+
+ adb $@ shell 'cd /system/bin; chmod 555 busybox; for x in `./busybox --list`; do ln -s ./busybox $x; done'
+ #adb $@ shell 'mkdir -p /data/busybox/busybox'
+ #adb $@ push $B2G_DEV_DIR/gaia/build/busybox-armv6l /data/busybox/busybox-bin
+ #adb $@ shell 'chmod 755 /data/busybox/busybox-bin'
+ #adb $@ remount
}
adb_busybox() {
@@ -108,7 +113,7 @@ b2g_repo_sync_manifest() {
./repo sync
}
-b2g_nserror() {
+moz_nserror() {
# find an error name based on it's code, or vice-versa using xpcshell
XPCSHELL=$B2G_DEV_DIR/gaia/xulrunner-sdk/bin/xpcshell
if [[ -z $1 ]]; then
@@ -123,3 +128,8 @@ b2g_nserror() {
$XPCSHELL -e "for (var err in Components.results) { var code = Components.results[err]; if (code === $ERR) { print(err + \" = \" + code); } }"
fi
}
+
+moz_compare_versions() {
+ XPCSHELL=$B2G_DEV_DIR/gaia/xulrunner-sdk/bin/xpcshell
+ $XPCSHELL $DOTFILES/mozilla/compare_versions.js $@
+}
View
19 mozilla/compare_versions.js
@@ -0,0 +1,19 @@
+Components.utils.import("resource://gre/modules/Services.jsm");
+
+let versions = arguments;
+let test_versions = [
+ "1.0", "1.0.0", "1.0.0beta", "1.0.0.1", "1.0.20", "1.0.2.0", "1.1.0.1",
+ "1.1.0", "1.1.0alpha"
+];
+
+versions.sort(Services.vc.compare);
+versions.reverse();
+
+for (let i = 0; i < versions.length; i++) {
+ if (i == 0) {
+ print(versions[i]);
+ continue;
+ }
+
+ print(" > " + versions[i]);
+}
View
10 mozilla/install_busybox
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ ! -f busybox-armv6l ]
+then
+ wget http://busybox.net/downloads/binaries/1.19.0/busybox-armv6l
+fi
+$ADB_PATH remount
+$ADB_PATH push busybox-armv6l /system/bin/busybox
+
+$ADB_PATH shell 'cd /system/bin; chmod 555 busybox; for x in `./busybox --list`; do ln -s ./busybox $x; done'
View
2  nodejs/nodejs.zsh
@@ -1,2 +1,2 @@
# NODE_PATH for npm / node installed via brew
-export NODE_PATH=/usr/local/lib/node_modules
+export NODE_PATH=/usr/local/lib/node_modules:/usr/local/share/npm/bin
1  vim/vim.symlink/bundle/vim-gitgutter
@@ -0,0 +1 @@
+Subproject commit 24efce03cc12dd30f63048627981ab911e551dd7
View
10 zsh/prompt.zsh
@@ -30,6 +30,14 @@ hg_prompt_info() {
hg prompt --angle-brackets "%{$fg_bold[green]%}[<branch>@<tags|,>]%{$reset_color%}" 2>/dev/null
}
+venv_info() {
+ if [ -n "$VIRTUAL_ENV" ]; then
+ echo -n "%{$fg_bold[green]%}[venv:%{$reset_color%}"
+ echo -n "%{$fg[white]%}`basename "$VIRTUAL_ENV"`%{$reset_color%}"
+ echo "%{$fg_bold[green]%}] "
+ fi
+}
+
current_dir() {
echo "%{$fg[white]%}[%~]%{$reset_color%}"
}
@@ -46,7 +54,7 @@ prompt_chars() {
echo "%{$fg[blue]%}->%{$fg_bold[blue]%} %#%{$reset_color%}"
}
-export PROMPT=$'$(user_at_host) $(current_time) $(current_dir) $(git_dirty)$(hg_prompt_info)\n$(prompt_chars) '
+export PROMPT=$'$(user_at_host) $(current_time) $(current_dir) $(git_dirty)$(hg_prompt_info)\n$(venv_info)$(prompt_chars) '
export RPROMPT='$(vi_mode_prompt_info)'
precmd() {

No commit comments for this range

Something went wrong with that request. Please try again.