From 7cf4f0dc8cbd3e490db9abf238da0c252eadc3e3 Mon Sep 17 00:00:00 2001
From: Steven Smith <Steveice10@gmail.com>
Date: Wed, 4 Feb 2015 20:23:44 -0800
Subject: [PATCH] Make use of enhanced app result reporting.

---
 source/main.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/source/main.cpp b/source/main.cpp
index 7bad3a8..de76539 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -3,6 +3,7 @@
 #include <sstream>
 #include <iomanip>
 #include <stdio.h>
+#include <sys/errno.h>
 
 typedef enum {
     INSTALL,
@@ -104,13 +105,17 @@ int main(int argc, char **argv) {
             if(ui_prompt(confirmStream.str(), true)) {
                 int ret = app_install(destination, file.fd, file.fileSize, onProgress);
                 std::stringstream resultMsg;
-                resultMsg << "Install ";
-                if(ret == 0) {
+                if(mode == INSTALL) {
+                    resultMsg << "Install ";
+                } else if(mode == DELETE) {
+                    resultMsg << "Delete ";
+                }
+
+                if(ret == APP_SUCCESS) {
                     resultMsg << "succeeded!";
-                } else if(ret == -2) {
-                    resultMsg << "cancelled!";
                 } else {
-                    resultMsg << "failed! Error: 0x" << std::hex << ret;
+                    resultMsg << "failed!" << "\n";
+                    resultMsg << app_get_result_string(ret);
                 }
 
                 ui_prompt(resultMsg.str(), false);
@@ -145,12 +150,11 @@ int main(int argc, char **argv) {
                     resultMsg << "Delete ";
                 }
 
-                if(ret == 0) {
+                if(ret == APP_SUCCESS) {
                     resultMsg << "succeeded!";
-                } else if(ret == -2) {
-                    resultMsg << "cancelled!";
                 } else {
-                    resultMsg << "failed! Error: 0x" << std::hex << ret;
+                    resultMsg << "failed!" << "\n";
+                    resultMsg << app_get_result_string(ret);
                 }
 
                 ui_prompt(resultMsg.str(), false);