fixed build for centos

build-in-docker.sh

@@ -6,7 +6,7 @@ myarch=$(dpkg --print-architecture)
 if test "${arch}" = "amd64"; then
     myarch="amd64|i386"
 fi
-mode="deb"
+mode=
 img="mwaeckerlin/ubuntu:latest"
 repos=()
 keys=()
@@ -241,7 +241,19 @@ if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
     docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -g) -d"${HOME}" $(id -un)
 fi
 docker exec ${DOCKER_ID} chown $(id -u):$(id -g) "${HOME}"
-case $mode in
+if test -z "$mode"; then
+    case "$targets" in
+        (*deb*) mode=deb;;
+        (*rpm*) mode=rpm;;
+        (*) case "$img" in
+                (*ubuntu*|*debian*|*mint*) mode=deb;;
+                (*fedora*|*centos*|*mageia*) mode=rpm;;
+                (*mingw*|*win*) mode=win;;
+                (*) mode=deb;;
+            esac;;
+    esac
+fi
+case "$mode" in
     (deb|apt|win)
         if [[ "${img}" =~ "ubuntu" ]]; then
             docker exec ${DOCKER_ID} locale-gen ${LANG}
@@ -281,7 +293,7 @@ case $mode in
         ;;
     (rpm|yum|dnf|zypper|urpmi)
         if [[ "$img" =~ "centos" ]]; then
-            docker exec ${DOCKER_ID} yum install -y redhat-lsb
+            docker exec ${DOCKER_ID} yum install -y redhat-lsb epel-release
             docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' <<EOF
 [WandiscoSVN]
 name=Wandisco SVN Repo

mac-create-app-bundle.sh

@@ -86,20 +86,19 @@ if test -n "${QTDIR}"; then
     fi
 fi
 
-# Step 5: copy or create info.plist
+# Step 5: copy local or create new info.plist
-infoplist=$(find ${apptarget}/Contents/Resources -name Info.plist)
+if test -f Info.plist; then
-if test -f "${infoplist}"; then
+    cp -a Info.plist ${apptarget}/Contents/Info.plist
-    cp -a "${infoplist}" ${apptarget}/Contents/Info.plist
 else
     cat > ${apptarget}/Contents/Info.plist <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
+  <qdict>
     <key>CFBundleIdentifier</key>
     <string>${project}</string>
     <key>CFBundleExecutable</key>
-    <string>${executablefile##/}</string>
+    <string>${executablefile##*/}</string>
   </dict>
 </plist>
 EOF