Skip to content

Commit

Permalink
functions.sh moved to separate repository
Browse files Browse the repository at this point in the history
  • Loading branch information
l0b0 committed Jun 13, 2012
1 parent 2ab20af commit e48ba0c
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 112 deletions.
3 changes: 3 additions & 0 deletions .bash_history
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ cd ~/dev/paperless/ # project
cd ~/dev/paperless.wiki/ # project
cd ~/dev/qr2scad/ # project
cd ~/dev/schemaspy2svg/ # project
cd ~/dev/shell-includes/ # project
cd ~/dev/shunit-ng/ # project
cd ~/dev/Smooth-CoffeeScript/ # project
cd ~/dev/subsurface/ # project
Expand Down Expand Up @@ -421,6 +422,7 @@ git stash show
git stash show --patch # diff
git stash show --patch stash@{1} # diff
git status
git submodule add git://github.com/l0b0/shell-includes.git
git svn clone -s -r 1:HEAD http://svn/repo
git svn clone -s -r 1:HEAD --no-minimize-url http://svn/repo/path
git svn dcommit
Expand Down Expand Up @@ -858,6 +860,7 @@ mkgithub ~/dev/rvm # ruby version manager
mkgithub ~/dev/schemaspy2svg
mkgithub ~/dev/screensaver-info
mkgithub ~/dev/see-colon
mkgithub ~/dev/shell-includes
mkgithub ~/dev/shunit-ng
mkgithub ~/dev/SICP
mkgithub ~/dev/Smooth-CoffeeScript
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "shell-includes"]
path = shell-includes
url = git://github.com/l0b0/shell-includes.git
1 change: 0 additions & 1 deletion README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ These will probably be moved to separate projects after a while:

* `tools.mk` - Auxiliary `make` targets.
* `scripts/duplicates.sh` - Check for duplicate files in two directories.
* `scripts/functions.sh` - Auxiliary functions.
* `scripts/install-all.sh` - Should probably be moved to `.bash_history`.
* `scripts/make-links.sh` - Create symbolic links for several files in a separate directory, asking for confirmation or diffing if there is a collision.
* `scripts/__svn_ps1.sh` - Similar to [`__git_ps1.sh`](), provides a string usable in Bash's `$PS1` when sourced while inside a Subversion repository.
Expand Down
2 changes: 1 addition & 1 deletion scripts/cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ shopt -s nullglob
directory="$(dirname -- "$0")"
PATH='/usr/bin:/bin'

. "$directory/functions.sh"
. "$directory/../shell-includes/functions.sh"

# Process parameters
until [ $# -eq 0 ]
Expand Down
2 changes: 1 addition & 1 deletion scripts/duplicates.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

directory="$(dirname -- "$(readlink -fn -- "$0")")"

. "$directory/functions.sh"
. "$directory/../shell-includes/functions.sh"

start_dir_x="$(readlink -fn -- "$1"; echo x)"
start_dir="${start_dir_x%x}"
Expand Down
107 changes: 0 additions & 107 deletions scripts/functions.sh

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/make-links.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ default_excludes=('\.' '\.\.' '\.git' '\.svn')

directory="$(dirname -- "$0")"

. "$directory/functions.sh"
. "$directory/../shell-includes/functions.sh"

# Process parameters
params="$(getopt -o d:e:fshv \
Expand Down
1 change: 1 addition & 0 deletions shell-includes
Submodule shell-includes added at 07d089
2 changes: 1 addition & 1 deletion tests/tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ shopt -s extglob

directory="$(dirname -- "$0")"

. "$directory/../scripts/functions.sh"
. "$directory/../shell-includes/functions.sh"

cd -- "$directory"
for path in !(tests.sh)
Expand Down

0 comments on commit e48ba0c

Please sign in to comment.