From 9b3a2586f243e8921e9e26db6e570f0f2e506659 Mon Sep 17 00:00:00 2001 From: Andrew Rynhard Date: Tue, 19 Apr 2016 00:14:10 -0700 Subject: [PATCH 1/3] Fix #303 --- pkg/omf/functions/bundle/omf.bundle.add.fish | 7 ++++++- pkg/omf/functions/bundle/omf.bundle.remove.fish | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/omf/functions/bundle/omf.bundle.add.fish b/pkg/omf/functions/bundle/omf.bundle.add.fish index 1aeeb76..f186886 100644 --- a/pkg/omf/functions/bundle/omf.bundle.add.fish +++ b/pkg/omf/functions/bundle/omf.bundle.add.fish @@ -1,5 +1,10 @@ function omf.bundle.add -a type name_or_url - set -l bundle $OMF_CONFIG/bundle + if test -h $OMF_CONFIG/bundle + set bundle (readlink $OMF_CONFIG/bundle) + else + set bundle $OMF_CONFIG/bundle + end + set -l record "$type $name_or_url" if test -f $bundle diff --git a/pkg/omf/functions/bundle/omf.bundle.remove.fish b/pkg/omf/functions/bundle/omf.bundle.remove.fish index b37bae0..ae90cd8 100644 --- a/pkg/omf/functions/bundle/omf.bundle.remove.fish +++ b/pkg/omf/functions/bundle/omf.bundle.remove.fish @@ -1,5 +1,9 @@ function omf.bundle.remove - set bundle $OMF_CONFIG/bundle + if test -h $OMF_CONFIG/bundle + set bundle (readlink $OMF_CONFIG/bundle) + else + set bundle $OMF_CONFIG/bundle + end if test -f $bundle set type $argv[1] From a5654cfec3341b6fc9c078d58b52b2f3c84a2a18 Mon Sep 17 00:00:00 2001 From: Andrew Rynhard Date: Tue, 19 Apr 2016 00:34:33 -0700 Subject: [PATCH 2/3] Use -L instead of -h --- pkg/omf/functions/bundle/omf.bundle.add.fish | 2 +- pkg/omf/functions/bundle/omf.bundle.remove.fish | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/omf/functions/bundle/omf.bundle.add.fish b/pkg/omf/functions/bundle/omf.bundle.add.fish index f186886..23550f6 100644 --- a/pkg/omf/functions/bundle/omf.bundle.add.fish +++ b/pkg/omf/functions/bundle/omf.bundle.add.fish @@ -1,5 +1,5 @@ function omf.bundle.add -a type name_or_url - if test -h $OMF_CONFIG/bundle + if test -L $OMF_CONFIG/bundle set bundle (readlink $OMF_CONFIG/bundle) else set bundle $OMF_CONFIG/bundle diff --git a/pkg/omf/functions/bundle/omf.bundle.remove.fish b/pkg/omf/functions/bundle/omf.bundle.remove.fish index ae90cd8..a3025f4 100644 --- a/pkg/omf/functions/bundle/omf.bundle.remove.fish +++ b/pkg/omf/functions/bundle/omf.bundle.remove.fish @@ -1,5 +1,5 @@ function omf.bundle.remove - if test -h $OMF_CONFIG/bundle + if test -L $OMF_CONFIG/bundle set bundle (readlink $OMF_CONFIG/bundle) else set bundle $OMF_CONFIG/bundle From 1853f30dd6b2df1b0e04c6a813790da85f3d3f02 Mon Sep 17 00:00:00 2001 From: Andrew Rynhard Date: Tue, 19 Apr 2016 01:16:58 -0700 Subject: [PATCH 3/3] Use local variables --- pkg/omf/functions/bundle/omf.bundle.add.fish | 4 ++-- pkg/omf/functions/bundle/omf.bundle.remove.fish | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/omf/functions/bundle/omf.bundle.add.fish b/pkg/omf/functions/bundle/omf.bundle.add.fish index 23550f6..9994a4a 100644 --- a/pkg/omf/functions/bundle/omf.bundle.add.fish +++ b/pkg/omf/functions/bundle/omf.bundle.add.fish @@ -1,8 +1,8 @@ function omf.bundle.add -a type name_or_url + set -l bundle $OMF_CONFIG/bundle + if test -L $OMF_CONFIG/bundle set bundle (readlink $OMF_CONFIG/bundle) - else - set bundle $OMF_CONFIG/bundle end set -l record "$type $name_or_url" diff --git a/pkg/omf/functions/bundle/omf.bundle.remove.fish b/pkg/omf/functions/bundle/omf.bundle.remove.fish index a3025f4..be89dfa 100644 --- a/pkg/omf/functions/bundle/omf.bundle.remove.fish +++ b/pkg/omf/functions/bundle/omf.bundle.remove.fish @@ -1,8 +1,8 @@ function omf.bundle.remove + set -l bundle $OMF_CONFIG/bundle + if test -L $OMF_CONFIG/bundle set bundle (readlink $OMF_CONFIG/bundle) - else - set bundle $OMF_CONFIG/bundle end if test -f $bundle