From ea681c7f522e5512fecaec5a094efb1b8ba969e5 Mon Sep 17 00:00:00 2001 From: "mr.Shu" Date: Tue, 25 Feb 2014 16:36:19 +0100 Subject: [PATCH 1/3] cleaned whitespace --- install-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-all.sh b/install-all.sh index 656d9d90..636bd6e7 100755 --- a/install-all.sh +++ b/install-all.sh @@ -23,7 +23,7 @@ fedora_prepare() echo ARCH=`arch` - + sudo yum -y install gcc git autoconf automake openssl-devel.$ARCH expat-devel.$ARCH ncurses-devel.$ARCH glib2-devel.$ARCH libnotify-devel.$ARCH libcurl-devel.$ARCH libXScrnSaver-devel.$ARCH libotr3-devel.$ARCH } From 611d5445312df9366f747879450f5c43d8a5fb0d Mon Sep 17 00:00:00 2001 From: "mr.Shu" Date: Tue, 25 Feb 2014 16:47:45 +0100 Subject: [PATCH 2/3] added error tracing --- install-all.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/install-all.sh b/install-all.sh index 636bd6e7..ed9293e6 100755 --- a/install-all.sh +++ b/install-all.sh @@ -1,7 +1,19 @@ -#!/bin/sh +#!/bin/bash + +set -o errtrace STATUS=development +error_handler() +{ + ERR_CODE=$? + echo "Error $ERR_CODE with command '$BASH_COMMAND' on line ${BASH_LINENO[0]}. Exiting." + exit $ERR_CODE + +} + +trap error_handler ERR + debian_prepare() { echo From 0d15c7108d4ffc82fc2bbc1c2c894bc6ff782841 Mon Sep 17 00:00:00 2001 From: "mr.Shu" Date: Tue, 25 Feb 2014 16:51:24 +0100 Subject: [PATCH 3/3] fixed indent in Makefile.am --- Makefile.am | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index b5eea266..31280b0c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,11 +25,11 @@ core_sources = \ src/xmpp/capabilities.h src/xmpp/connection.h \ src/xmpp/roster.c src/xmpp/roster.h \ src/xmpp/bookmark.c src/xmpp/bookmark.h \ - src/server_events.c src/server_events.h \ + src/server_events.c src/server_events.h \ src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/core.c \ src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \ src/ui/console.c src/ui/notifier.c \ - src/ui/windows.c src/ui/windows.h \ + src/ui/windows.c src/ui/windows.h \ src/command/command.h src/command/command.c src/command/history.c \ src/command/commands.h src/command/commands.c \ src/command/history.h src/tools/parser.c \ @@ -62,18 +62,18 @@ test_sources = \ src/config/account.c src/config/account.h \ src/config/preferences.c src/config/preferences.h \ src/config/theme.c src/config/theme.h \ - src/ui/windows.c src/ui/windows.h \ - src/ui/window.c src/ui/window.h \ - src/server_events.c src/server_events.h \ - tests/xmpp/mock_xmpp.h tests/xmpp/mock_xmpp.c \ - tests/otr/mock_otr.h tests/otr/mock_otr.c \ - tests/ui/mock_ui.h tests/ui/mock_ui.c \ - tests/config/mock_accounts.h tests/config/mock_accounts.c \ - tests/helpers.c tests/helpers.h \ - tests/log/mock_log.c \ - tests/test_autocomplete.c \ - tests/test_common.c \ - tests/test_contact.c \ + src/ui/windows.c src/ui/windows.h \ + src/ui/window.c src/ui/window.h \ + src/server_events.c src/server_events.h \ + tests/xmpp/mock_xmpp.h tests/xmpp/mock_xmpp.c \ + tests/otr/mock_otr.h tests/otr/mock_otr.c \ + tests/ui/mock_ui.h tests/ui/mock_ui.c \ + tests/config/mock_accounts.h tests/config/mock_accounts.c \ + tests/helpers.c tests/helpers.h \ + tests/log/mock_log.c \ + tests/test_autocomplete.c \ + tests/test_common.c \ + tests/test_contact.c \ tests/test_cmd_connect.c \ tests/test_cmd_account.c \ tests/test_cmd_rooms.c \ @@ -89,18 +89,18 @@ test_sources = \ tests/test_preferences.c \ tests/test_server_events.c \ tests/test_muc.c \ - tests/testsuite.c + tests/testsuite.c main_source = src/main.c git_sources = \ - src/gitversion.c + src/gitversion.c otr3_sources = \ - src/otr/otrlib.h src/otr/otrlibv3.c src/otr/otr.h src/otr/otr.c + src/otr/otrlib.h src/otr/otrlibv3.c src/otr/otr.h src/otr/otr.c otr4_sources = \ - src/otr/otrlib.h src/otr/otrlibv4.c src/otr/otr.h src/otr/otr.c + src/otr/otrlib.h src/otr/otrlibv4.c src/otr/otr.h src/otr/otr.c if INCLUDE_GIT_VERSION with_git_sources = $(git_sources) $(core_sources)