Ticket #6772: cpsvndir_themes3.patch

themes.pro

@@ -7 +7 @@
 TEMPLATE = app
 CONFIG -= moc qt
 
-!macx:QMAKE_COPY_DIR = sh ./cpsvndir
+QMAKE_COPY_DIR = sh ./cpsvndir
 
 themes.path = $${PREFIX}/share/mythtv/themes/
 themes.files  = ProjectGrayhem ProjectGrayhem-wide ProjectGrayhem-OSD

cpsvndir

@@ -2 +2 @@
 #
 # cpsvndir: recursive directory copy excluding .svn sub dirs.
 
-DESTDIR=$2
-SOURCE=$(basename "$1")
 
 if [ -z "$1" -o -z "$2" ]; then
     echo "Usage: $0 source-dir destination-dir"
@@ -17 +15 @@
     if [ -z "$EUID" ];     then EUID=0       ;fi  # Will fail if not root
 fi
 
+# Do similarly for EGID
+if [ -z "$EGID" ]; then
+    if [ -x /usr/bin/id ]; then EGID=`id -g` ;fi
+    if [ -z "$EGID" ];     then EGID=0       ;fi  # Will fail if not root
+fi
 
-mkdir -p $DESTDIR/$SOURCE || exit 1
+# Build directory structure
+IFS=$'\012'
+for directory in $(find "$1" -path '*/.svn' -prune -or -type d -print); do
+    mkdir -p "$2/${1##*/}/${directory/#$1}"
+done
 
-find $SOURCE -path '*/.svn' -prune -or -type d -exec mkdir -p $DESTDIR/{} \;
-find $SOURCE -path '*/.svn' -prune -or ! -type d \
-             -exec cp -p {}    $DESTDIR/{} \; \
-             -exec chown $EUID $DESTDIR/{} \; \
-             -exec chmod +r    $DESTDIR/{} \;
+# Copy files
+for file in $(find "$1" -path '*/.svn' -prune -or ! -type d -print); do
+    cp -pR "$file" "$2/${1##*/}/${file/#$1}"
+    chown $EUID:$EGID "$2/${1##*/}/${file/#$1}" &> /dev/null
+    chmod +r "$2/${1##*/}/${file/#$1}" &> /dev/null
+done
 
-
 exit 0