#798: English grammar fix for success message (#802)

devonfw · Jun 24, 2022 · 94a9ff7 · 94a9ff7
1 parent 876aab9
commit 94a9ff7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/scripts/src/main/resources/scripts/command/ide b/scripts/src/main/resources/scripts/command/ide
@@ -335,7 +335,6 @@ function doUpdateSoftware() {
       then
         doEchoStep "Setting up ${tool}"
         doDevonCommand "${tool}" setup
-        doSuccess "Success"
       fi
     done
   fi
@@ -373,7 +372,6 @@ function doUpdateSoftware() {
           fi
         fi
         doInstall "-" "${DEVON_IDE_HOME}/software/${software}" "${software}" "${software_version}" "" "" "${os}" "" ".tgz" "${repo}"
-        doSuccess "Success"
       fi
     fi
   done

diff --git a/scripts/src/main/resources/scripts/functions b/scripts/src/main/resources/scripts/functions
@@ -47,7 +47,7 @@ function doEchoAttention() {
 function doResult() {
   if [ "${2}" = 0 ]
   then
-    doSuccess "Succeeded to ${1}"
+    doSuccess "Success: ${1}"
   else
     if [ -z "${2}" ]
     then
@@ -72,27 +72,21 @@ function doRunCommand() {
       doFail "Working directory ${3} does not exist."
     fi
   fi
-  doDebug "Running command: ${1}"
-  eval "${1}"
-  result=${?}
-  if [ -n "${3}" ]
-  then
-    cd "${cwd}" || exit 1
-  fi
   local message
   if [ -z "${2}" ]
   then
     message="run command ${1/ */}"
   else
     message="${2} (${1/ */})"
   fi
-  if [ ${result} = 0 ]
+  doDebug "Trying to ${message}"
+  eval "${1}"
+  result=${?}
+  if [ -n "${3}" ]
   then
-    doSuccess "Succeeded to ${message}"
-  else
-    doError "Failed to run command: ${1}"
-    doFail "Failed to ${message}" ${result}
+    cd "${cwd}" || exit 1
   fi
+  doResult "${message}" ${result}
 }
 
 function doIsForce() {