diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh index 636ac1b..4b19b9c 100755 --- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh +++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh @@ -210,24 +210,24 @@ else echo "$item $itemName" #Check icon (expecting beginning with “http” to be web-link and “/” to be disk file) - echo "icon before check: $icon" + #echo "icon before check: $icon" if [[ "$(echo ${icon} | grep -iE "^(http|ftp).*")" != "" ]]; then - echo "icon looks to be web-link" + #echo "icon looks to be web-link" if ! curl -sfL --output /dev/null -r 0-0 "${icon}" ; then - echo "ERROR: Cannot download link. Reset icon." + echo "ERROR: Cannot download ${icon} link. Reset icon." icon="" fi elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then - echo "icon looks to be a file" + #echo "icon looks to be a file" if [[ ! -a "${icon}" ]]; then - echo "ERROR: Cannot find file. Reset icon." + echo "ERROR: Cannot find icon file ${icon}. Reset icon." icon="" fi else - echo "ERROR: Cannot figure out icon. Reset icon." + echo "ERROR: Cannot figure out icon ${icon}. Reset icon." icon="" fi - echo "icon after first check: $icon" + #echo "icon after first check: $icon" # If no icon defined we are trying to search for installed app icon if [[ "$icon" == "" ]]; then appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true) @@ -236,7 +236,7 @@ else appIcon="${appIcon}.icns" fi icon="${appPath}/Contents/Resources/${appIcon}" - echo "Icon before file check: ${icon}" + #echo "Icon before file check: ${icon}" if [ ! -f "${icon}" ]; then # Using LOGO variable to show logo in swiftDialog case $LOGO in diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh index 97a43cb..a1d6d7c 100755 --- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh +++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh @@ -156,24 +156,24 @@ else echo "$item $itemName" #Check icon (expecting beginning with “http” to be web-link and “/” to be disk file) - echo "icon before check: $icon" + #echo "icon before check: $icon" if [[ "$(echo ${icon} | grep -iE "^(http|ftp).*")" != "" ]]; then - echo "icon looks to be web-link" + #echo "icon looks to be web-link" if ! curl -sfL --output /dev/null -r 0-0 "${icon}" ; then - echo "ERROR: Cannot download link. Reset icon." + echo "ERROR: Cannot download ${icon} link. Reset icon." icon="" fi elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then - echo "icon looks to be a file" + #echo "icon looks to be a file" if [[ ! -a "${icon}" ]]; then - echo "ERROR: Cannot find file. Reset icon." + echo "ERROR: Cannot find icon file ${icon}. Reset icon." icon="" fi else - echo "ERROR: Cannot figure out icon. Reset icon." + echo "ERROR: Cannot figure out icon ${icon}. Reset icon." icon="" fi - echo "icon after first check: $icon" + #echo "icon after first check: $icon" # If no icon defined we are trying to search for installed app icon if [[ "$icon" == "" ]]; then appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true) @@ -182,7 +182,7 @@ else appIcon="${appIcon}.icns" fi icon="${appPath}/Contents/Resources/${appIcon}" - echo "Icon before file check: ${icon}" + #echo "Icon before file check: ${icon}" if [ ! -f "${icon}" ]; then # Using LOGO variable to show logo in swiftDialog case $LOGO in diff --git a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh index a08b272..5714f05 100755 --- a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh +++ b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh @@ -140,24 +140,24 @@ else echo "$item $itemName" #Check icon (expecting beginning with “http” to be web-link and “/” to be disk file) - echo "icon before check: $icon" + #echo "icon before check: $icon" if [[ "$(echo ${icon} | grep -iE "^(http|ftp).*")" != "" ]]; then - echo "icon looks to be web-link" + #echo "icon looks to be web-link" if ! curl -sfL --output /dev/null -r 0-0 "${icon}" ; then - echo "ERROR: Cannot download link. Reset icon." + echo "ERROR: Cannot download ${icon} link. Reset icon." icon="" fi elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then - echo "icon looks to be a file" + #echo "icon looks to be a file" if [[ ! -a "${icon}" ]]; then - echo "ERROR: Cannot find file. Reset icon." + echo "ERROR: Cannot find icon file ${icon}. Reset icon." icon="" fi else - echo "ERROR: Cannot figure out icon. Reset icon." + echo "ERROR: Cannot figure out icon ${icon}. Reset icon." icon="" fi - echo "icon after first check: $icon" + #echo "icon after first check: $icon" # If no icon defined we are trying to search for installed app icon if [[ "$icon" == "" ]]; then appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true) @@ -166,7 +166,7 @@ else appIcon="${appIcon}.icns" fi icon="${appPath}/Contents/Resources/${appIcon}" - echo "Icon before file check: ${icon}" + #echo "Icon before file check: ${icon}" if [ ! -f "${icon}" ]; then # Using LOGO variable to show logo in swiftDialog case $LOGO in diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh index 6a114e0..ecbf825 100644 --- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh +++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh @@ -140,24 +140,24 @@ else echo "$item $itemName" #Check icon (expecting beginning with “http” to be web-link and “/” to be disk file) - echo "icon before check: $icon" + #echo "icon before check: $icon" if [[ "$(echo ${icon} | grep -iE "^(http|ftp).*")" != "" ]]; then - echo "icon looks to be web-link" + #echo "icon looks to be web-link" if ! curl -sfL --output /dev/null -r 0-0 "${icon}" ; then - echo "ERROR: Cannot download link. Reset icon." + echo "ERROR: Cannot download ${icon} link. Reset icon." icon="" fi elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then - echo "icon looks to be a file" + #echo "icon looks to be a file" if [[ ! -a "${icon}" ]]; then - echo "ERROR: Cannot find file. Reset icon." + echo "ERROR: Cannot find icon file ${icon}. Reset icon." icon="" fi else - echo "ERROR: Cannot figure out icon. Reset icon." + echo "ERROR: Cannot figure out icon ${icon}. Reset icon." icon="" fi - echo "icon after first check: $icon" + #echo "icon after first check: $icon" # If no icon defined we are trying to search for installed app icon if [[ "$icon" == "" ]]; then appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true) @@ -166,7 +166,7 @@ else appIcon="${appIcon}.icns" fi icon="${appPath}/Contents/Resources/${appIcon}" - echo "Icon before file check: ${icon}" + #echo "Icon before file check: ${icon}" if [ ! -f "${icon}" ]; then # Using LOGO variable to show logo in swiftDialog case $LOGO in diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh index 7d4c231..9f31c1d 100644 --- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh +++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh @@ -137,24 +137,24 @@ else echo "$item $itemName" #Check icon (expecting beginning with “http” to be web-link and “/” to be disk file) - echo "icon before check: $icon" + #echo "icon before check: $icon" if [[ "$(echo ${icon} | grep -iE "^(http|ftp).*")" != "" ]]; then - echo "icon looks to be web-link" + #echo "icon looks to be web-link" if ! curl -sfL --output /dev/null -r 0-0 "${icon}" ; then - echo "ERROR: Cannot download link. Reset icon." + echo "ERROR: Cannot download ${icon} link. Reset icon." icon="" fi elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then - echo "icon looks to be a file" + #echo "icon looks to be a file" if [[ ! -a "${icon}" ]]; then - echo "ERROR: Cannot find file. Reset icon." + echo "ERROR: Cannot find icon file ${icon}. Reset icon." icon="" fi else - echo "ERROR: Cannot figure out icon. Reset icon." + echo "ERROR: Cannot figure out icon ${icon}. Reset icon." icon="" fi - echo "icon after first check: $icon" + #echo "icon after first check: $icon" # If no icon defined we are trying to search for installed app icon if [[ "$icon" == "" ]]; then appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true) @@ -163,7 +163,7 @@ else appIcon="${appIcon}.icns" fi icon="${appPath}/Contents/Resources/${appIcon}" - echo "Icon before file check: ${icon}" + #echo "Icon before file check: ${icon}" if [ ! -f "${icon}" ]; then # Using LOGO variable to show logo in swiftDialog case $LOGO in diff --git a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh index 9bacc2f..fde5e30 100644 --- a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh +++ b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh @@ -140,24 +140,24 @@ else echo "$item $itemName" #Check icon (expecting beginning with “http” to be web-link and “/” to be disk file) - echo "icon before check: $icon" + #echo "icon before check: $icon" if [[ "$(echo ${icon} | grep -iE "^(http|ftp).*")" != "" ]]; then - echo "icon looks to be web-link" + #echo "icon looks to be web-link" if ! curl -sfL --output /dev/null -r 0-0 "${icon}" ; then - echo "ERROR: Cannot download link. Reset icon." + echo "ERROR: Cannot download ${icon} link. Reset icon." icon="" fi elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then - echo "icon looks to be a file" + #echo "icon looks to be a file" if [[ ! -a "${icon}" ]]; then - echo "ERROR: Cannot find file. Reset icon." + echo "ERROR: Cannot find icon file ${icon}. Reset icon." icon="" fi else - echo "ERROR: Cannot figure out icon. Reset icon." + echo "ERROR: Cannot figure out icon ${icon}. Reset icon." icon="" fi - echo "icon after first check: $icon" + #echo "icon after first check: $icon" # If no icon defined we are trying to search for installed app icon if [[ "$icon" == "" ]]; then appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true) @@ -166,7 +166,7 @@ else appIcon="${appIcon}.icns" fi icon="${appPath}/Contents/Resources/${appIcon}" - echo "Icon before file check: ${icon}" + #echo "Icon before file check: ${icon}" if [ ! -f "${icon}" ]; then # Using LOGO variable to show logo in swiftDialog case $LOGO in