From c0ac413a40256ea92cfee66cc41f2c3c2db5ae43 Mon Sep 17 00:00:00 2001
From: Igor Malinovskiy <u.glide@gmail.com>
Date: Wed, 11 Jun 2014 22:16:19 +0300
Subject: [PATCH] Fix path in build scripts

---
 build/build_osxbundle.sh | 15 +++++++--------
 build/build_package.sh   | 16 ++++++++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/build/build_osxbundle.sh b/build/build_osxbundle.sh
index 9df38f1a..9322750b 100644
--- a/build/build_osxbundle.sh
+++ b/build/build_osxbundle.sh
@@ -10,15 +10,14 @@ echo ===========================
 
 rm -fR ./bin/linux/release/*
 
-
-echo ‘============== Build crash reporter ================’
-cd ./crashreporter
-qmake “CONFIG+=release CONFIG-=debug”
+echo '============== Build crash reporter ================'
+cd ./3rdparty/crashreporter
+qmake CONFIG+=release DESTDIR=$SOURCE_DIR/bin/linux/release DEFINES+=RDM_VERSION="\\\"$1\\\""
 make -s clean
 make -s -j 2
 
-echo ‘============== Build rdm ================’
-cd ./../redis-desktop-manager/
+echo '============== Build rdm ================'
+cd ./../../src/
 pwd
 sh ./configure
 qmake
@@ -32,8 +31,8 @@ BUNDLE_PATH=./bin/linux/release/
 BUILD_DIR=$BUNDLE_PATH/rdm.app/Contents/
 MAC_TOOL=$QTPATH/macdeployqt
 
-cp -f ./redis-desktop-manager/resources/Info.plist $BUILD_DIR/
-cp -f ./redis-desktop-manager/resources/rdm.icns $BUILD_DIR/Resources/
+cp -f ./src/resources/Info.plist $BUILD_DIR/
+cp -f ./src/resources/rdm.icns $BUILD_DIR/Resources/
 
 cd $BUNDLE_PATH
 
diff --git a/build/build_package.sh b/build/build_package.sh
index 0fed6bc5..474273db 100644
--- a/build/build_package.sh
+++ b/build/build_package.sh
@@ -12,6 +12,7 @@ TAG=$1
 echo "# Package version: $TAG"
 
 echo '# Build dir:'
+cd ./../
 SOURCE_DIR=`pwd`
 pwd
 
@@ -26,18 +27,18 @@ echo
 echo ===========================
 echo Build Crash Reporter :
 echo ===========================
-cd ./crashreporter
-qmake
+cd ./3rdparty/crashreporter
+qmake CONFIG+=release DESTDIR=$SOURCE_DIR/bin/linux/release DEFINES+=RDM_VERSION="\\\"$1\\\""
 make clean
 make
 
-cd ./../
+cd $SOURCE_DIR
 
 echo
 echo ===========================
 echo Build Dependencies :
 echo ===========================
-cd ./redis-desktop-manager
+cd ./src
 chmod +x ./configure
 ./configure
 
@@ -51,7 +52,7 @@ BUILD_DIR=./redis-desktop-manager-$TAG
 rm -fR $BUILD_DIR/*
 mkdir $BUILD_DIR
 
-cp -Rf ./redis-desktop-manager/* $BUILD_DIR
+cp -Rf ./src/* $BUILD_DIR
 chmod +x $BUILD_DIR/configure
 mkdir $BUILD_DIR/debian 
 cp -Rf ./build/debian/* $BUILD_DIR/debian  
@@ -115,9 +116,12 @@ PLATFORM=$(uname -m)
 
 BUILDERNAME=$(lsb_release -si)$(lsb_release -sr)
 
-if [ "$PLATFORM" != 'x86_64' ]; then
+if [ "$PLATFORM" == 'x86_64' ]; then
+    PLATFORM='amd64'
+else 
     PLATFORM='i386'
 fi
+
 PACKAGESUFIX=$TAG"_"$PLATFORM
 
 FILENAME="redis-desktop-manager_"$PACKAGESUFIX".deb"