From 04824846a1e4bd41bd9f2ce578fe4fe59b93d1f5 Mon Sep 17 00:00:00 2001
From: "H. William Welliver III" <bill@welliver.org>
Date: Wed, 29 Oct 2003 14:46:49 -0500
Subject: [PATCH] install_module gets along better with directory modules
Rev: bin/install_module:1.5
---
bin/install_module | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/bin/install_module b/bin/install_module
index 89824b4cd8..d5b9a8b491 100755
--- a/bin/install_module
+++ b/bin/install_module
@@ -17,11 +17,8 @@ do
*.pmod)
if [ -d "$DIR" ]; then
break
- else
- :
fi
-
if [ -f "$DIR" ]; then
mv "$DIR" "$DIR-foo"
mkdir $DIR
@@ -53,10 +50,23 @@ else
:
fi
-if [ -d "$BASE.pmod" ]; then
- EXT=`echo $TO | sed -e 's@(\.[^.]$)@\1@/'`
- TO="$BASE.pmod/module.$EXT"
+if [ -d "$BASE.pmod" -a -d "$FROM" ]; then
+# we are copying a dir module into a dir module.
+ FROM="$FROM/."
+elif [ -d "$BASE.pmod" ]; then
+ EXT=`echo $TO | sed -e 's@^.*\.\(.[^\.]*\)$@\1@'`
+ TO="$BASE.pmod/module.$EXT"
+fi
+
+# Add proper flag to copy recursively if FROM is a directory module
+
+CPFLAGS=""
+
+if [ -d "$FROM" ]; then
+ CPFLAGS="-r"
fi
+pwd
+ cp $CPFLAGS "$FROM" "$TO"
-exec cp "$FROM" "$TO"
+exit $?
--
GitLab