rcm: 1.2.3 -> 1.3.0 (#16847)

This commit is contained in:
Scott Stevenson
2016-07-11 18:11:31 +02:00
committed by Robin Gloster
parent 8f98fcd73b
commit 8c81c234d3
2 changed files with 51 additions and 71 deletions
+48 -68
View File
@@ -1,68 +1,48 @@
*** rcm-1.2.3/bin/lsrc.in.orig 2014-05-09 04:57:39.000000000 -0700
--- rcm-1.2.3/bin/lsrc.in 2015-01-24 14:27:48.786595479 -0800
***************
*** 1,6 ****
#!@SHELL@
! : ${RCM_LIB:=$(dirname "$0")/../share/rcm}
. "$RCM_LIB/rcm.sh"
pushdir() {
--- 1,6 ----
#!@SHELL@
! RCM_LIB=@rcm@/share/rcm
. "$RCM_LIB/rcm.sh"
pushdir() {
*** rcm-1.2.3/bin/mkrc.in.orig 2014-05-09 04:57:39.000000000 -0700
--- rcm-1.2.3/bin/mkrc.in 2015-01-24 14:27:48.786595479 -0800
***************
*** 1,6 ****
#!@SHELL@
! : ${RCM_LIB:=$(dirname "$0")/../share/rcm}
. "$RCM_LIB/rcm.sh"
destination() {
--- 1,6 ----
#!@SHELL@
! RCM_LIB=@rcm@/share/rcm
. "$RCM_LIB/rcm.sh"
destination() {
*** rcm-1.2.3/bin/rcdn.in.orig 2014-05-09 04:57:39.000000000 -0700
--- rcm-1.2.3/bin/rcdn.in 2015-01-24 14:27:48.786595479 -0800
***************
*** 1,6 ****
#!@SHELL@
! : ${RCM_LIB:=$(dirname "$0")/../share/rcm}
. "$RCM_LIB/rcm.sh"
remove_link() {
--- 1,6 ----
#!@SHELL@
! RCM_LIB=@rcm@/share/rcm
. "$RCM_LIB/rcm.sh"
remove_link() {
*** rcm-1.2.3/bin/rcup.in.orig 2014-05-09 04:57:39.000000000 -0700
--- rcm-1.2.3/bin/rcup.in 2015-01-24 14:27:48.786595479 -0800
***************
*** 1,6 ****
#!@SHELL@
! : ${RCM_LIB:=$(dirname "$0")/../share/rcm}
. "$RCM_LIB/rcm.sh"
link_or_copy() {
--- 1,6 ----
#!@SHELL@
! RCM_LIB=@rcm@/share/rcm
. "$RCM_LIB/rcm.sh"
link_or_copy() {
diff --git a/bin/lsrc.in b/bin/lsrc.in
index fcf5fbe..119d659 100755
--- a/bin/lsrc.in
+++ b/bin/lsrc.in
@@ -1,6 +1,6 @@
#!@SHELL@
-: ${RCM_LIB:=$(dirname "$0")/../share/rcm}
+RCM_LIB=@rcm@/share/rcm
. "$RCM_LIB/rcm.sh"
pushdir() {
diff --git a/bin/mkrc.in b/bin/mkrc.in
index da22a63..a6bb0ad 100755
--- a/bin/mkrc.in
+++ b/bin/mkrc.in
@@ -1,6 +1,6 @@
#!@SHELL@
-: ${RCM_LIB:=$(dirname "$0")/../share/rcm}
+RCM_LIB=@rcm@/share/rcm
. "$RCM_LIB/rcm.sh"
destination() {
diff --git a/bin/rcdn.in b/bin/rcdn.in
index ae7aad8..c210599 100755
--- a/bin/rcdn.in
+++ b/bin/rcdn.in
@@ -1,6 +1,6 @@
#!@SHELL@
-: ${RCM_LIB:=$(dirname "$0")/../share/rcm}
+RCM_LIB=@rcm@/share/rcm
. "$RCM_LIB/rcm.sh"
remove_link() {
diff --git a/bin/rcup.in b/bin/rcup.in
index bdae664..2076f53 100755
--- a/bin/rcup.in
+++ b/bin/rcup.in
@@ -1,6 +1,6 @@
#!@SHELL@
-: ${RCM_LIB:=$(dirname "$0")/../share/rcm}
+RCM_LIB=@rcm@/share/rcm
. "$RCM_LIB/rcm.sh"
print_ln_v() {