mtan93/Installomator
1
0
Fork 0
mirror of https://github.com/mtan93/Installomator.git synced 2026-03-08 05:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Many fewer icon logs.

Browse Source
This commit is contained in:
Theile
2022-10-25 20:57:11 +02:00
parent afc906161a
commit 98f0fb1a77
6 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh
View File

@@ -210,24 +210,24 @@ else
echo "$item $itemName" echo "$item $itemName"
#Check icon (expecting beginning with “http” to be web-link and “/” to be disk file) #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 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 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="" icon=""
fi fi
elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then
echo "icon looks to be a file" #echo "icon looks to be a file"
if [[ ! -a "${icon}" ]]; then if [[ ! -a "${icon}" ]]; then
echo "ERROR: Cannot find file. Reset icon." echo "ERROR: Cannot find icon file ${icon}. Reset icon."
icon="" icon=""
fi fi
else else
echo "ERROR: Cannot figure out icon. Reset icon." echo "ERROR: Cannot figure out icon ${icon}. Reset icon."
icon="" icon=""
fi 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 no icon defined we are trying to search for installed app icon
if [[ "$icon" == "" ]]; then if [[ "$icon" == "" ]]; then
appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true) appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true)
@@ -236,7 +236,7 @@ else
appIcon="${appIcon}.icns" appIcon="${appIcon}.icns"
fi fi
icon="${appPath}/Contents/Resources/${appIcon}" icon="${appPath}/Contents/Resources/${appIcon}"
echo "Icon before file check: ${icon}" #echo "Icon before file check: ${icon}"
if [ ! -f "${icon}" ]; then if [ ! -f "${icon}" ]; then
# Using LOGO variable to show logo in swiftDialog # Using LOGO variable to show logo in swiftDialog
case $LOGO in case $LOGO in

16
MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh
View File

@@ -156,24 +156,24 @@ else
echo "$item $itemName" echo "$item $itemName"
#Check icon (expecting beginning with “http” to be web-link and “/” to be disk file) #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 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 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="" icon=""
fi fi
elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then
echo "icon looks to be a file" #echo "icon looks to be a file"
if [[ ! -a "${icon}" ]]; then if [[ ! -a "${icon}" ]]; then
echo "ERROR: Cannot find file. Reset icon." echo "ERROR: Cannot find icon file ${icon}. Reset icon."
icon="" icon=""
fi fi
else else
echo "ERROR: Cannot figure out icon. Reset icon." echo "ERROR: Cannot figure out icon ${icon}. Reset icon."
icon="" icon=""
fi 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 no icon defined we are trying to search for installed app icon
if [[ "$icon" == "" ]]; then if [[ "$icon" == "" ]]; then
appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true) appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true)
@@ -182,7 +182,7 @@ else
appIcon="${appIcon}.icns" appIcon="${appIcon}.icns"
fi fi
icon="${appPath}/Contents/Resources/${appIcon}" icon="${appPath}/Contents/Resources/${appIcon}"
echo "Icon before file check: ${icon}" #echo "Icon before file check: ${icon}"
if [ ! -f "${icon}" ]; then if [ ! -f "${icon}" ]; then
# Using LOGO variable to show logo in swiftDialog # Using LOGO variable to show logo in swiftDialog
case $LOGO in case $LOGO in

16
MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh
View File

@@ -140,24 +140,24 @@ else
echo "$item $itemName" echo "$item $itemName"
#Check icon (expecting beginning with “http” to be web-link and “/” to be disk file) #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 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 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="" icon=""
fi fi
elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then
echo "icon looks to be a file" #echo "icon looks to be a file"
if [[ ! -a "${icon}" ]]; then if [[ ! -a "${icon}" ]]; then
echo "ERROR: Cannot find file. Reset icon." echo "ERROR: Cannot find icon file ${icon}. Reset icon."
icon="" icon=""
fi fi
else else
echo "ERROR: Cannot figure out icon. Reset icon." echo "ERROR: Cannot figure out icon ${icon}. Reset icon."
icon="" icon=""
fi 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 no icon defined we are trying to search for installed app icon
if [[ "$icon" == "" ]]; then if [[ "$icon" == "" ]]; then
appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true) appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true)
@@ -166,7 +166,7 @@ else
appIcon="${appIcon}.icns" appIcon="${appIcon}.icns"
fi fi
icon="${appPath}/Contents/Resources/${appIcon}" icon="${appPath}/Contents/Resources/${appIcon}"
echo "Icon before file check: ${icon}" #echo "Icon before file check: ${icon}"
if [ ! -f "${icon}" ]; then if [ ! -f "${icon}" ]; then
# Using LOGO variable to show logo in swiftDialog # Using LOGO variable to show logo in swiftDialog
case $LOGO in case $LOGO in

16
MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh
View File

@@ -140,24 +140,24 @@ else
echo "$item $itemName" echo "$item $itemName"
#Check icon (expecting beginning with “http” to be web-link and “/” to be disk file) #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 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 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="" icon=""
fi fi
elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then
echo "icon looks to be a file" #echo "icon looks to be a file"
if [[ ! -a "${icon}" ]]; then if [[ ! -a "${icon}" ]]; then
echo "ERROR: Cannot find file. Reset icon." echo "ERROR: Cannot find icon file ${icon}. Reset icon."
icon="" icon=""
fi fi
else else
echo "ERROR: Cannot figure out icon. Reset icon." echo "ERROR: Cannot figure out icon ${icon}. Reset icon."
icon="" icon=""
fi 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 no icon defined we are trying to search for installed app icon
if [[ "$icon" == "" ]]; then if [[ "$icon" == "" ]]; then
appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true) appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true)
@@ -166,7 +166,7 @@ else
appIcon="${appIcon}.icns" appIcon="${appIcon}.icns"
fi fi
icon="${appPath}/Contents/Resources/${appIcon}" icon="${appPath}/Contents/Resources/${appIcon}"
echo "Icon before file check: ${icon}" #echo "Icon before file check: ${icon}"
if [ ! -f "${icon}" ]; then if [ ! -f "${icon}" ]; then
# Using LOGO variable to show logo in swiftDialog # Using LOGO variable to show logo in swiftDialog
case $LOGO in case $LOGO in

16
MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh
View File

@@ -137,24 +137,24 @@ else
echo "$item $itemName" echo "$item $itemName"
#Check icon (expecting beginning with “http” to be web-link and “/” to be disk file) #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 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 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="" icon=""
fi fi
elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then
echo "icon looks to be a file" #echo "icon looks to be a file"
if [[ ! -a "${icon}" ]]; then if [[ ! -a "${icon}" ]]; then
echo "ERROR: Cannot find file. Reset icon." echo "ERROR: Cannot find icon file ${icon}. Reset icon."
icon="" icon=""
fi fi
else else
echo "ERROR: Cannot figure out icon. Reset icon." echo "ERROR: Cannot figure out icon ${icon}. Reset icon."
icon="" icon=""
fi 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 no icon defined we are trying to search for installed app icon
if [[ "$icon" == "" ]]; then if [[ "$icon" == "" ]]; then
appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true) appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true)
@@ -163,7 +163,7 @@ else
appIcon="${appIcon}.icns" appIcon="${appIcon}.icns"
fi fi
icon="${appPath}/Contents/Resources/${appIcon}" icon="${appPath}/Contents/Resources/${appIcon}"
echo "Icon before file check: ${icon}" #echo "Icon before file check: ${icon}"
if [ ! -f "${icon}" ]; then if [ ! -f "${icon}" ]; then
# Using LOGO variable to show logo in swiftDialog # Using LOGO variable to show logo in swiftDialog
case $LOGO in case $LOGO in

16
MDM/App-install SS with swiftDialog and dockutil/App service SS.sh
View File

@@ -140,24 +140,24 @@ else
echo "$item $itemName" echo "$item $itemName"
#Check icon (expecting beginning with “http” to be web-link and “/” to be disk file) #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 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 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="" icon=""
fi fi
elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then
echo "icon looks to be a file" #echo "icon looks to be a file"
if [[ ! -a "${icon}" ]]; then if [[ ! -a "${icon}" ]]; then
echo "ERROR: Cannot find file. Reset icon." echo "ERROR: Cannot find icon file ${icon}. Reset icon."
icon="" icon=""
fi fi
else else
echo "ERROR: Cannot figure out icon. Reset icon." echo "ERROR: Cannot figure out icon ${icon}. Reset icon."
icon="" icon=""
fi 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 no icon defined we are trying to search for installed app icon
if [[ "$icon" == "" ]]; then if [[ "$icon" == "" ]]; then
appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true) appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true)
@@ -166,7 +166,7 @@ else
appIcon="${appIcon}.icns" appIcon="${appIcon}.icns"
fi fi
icon="${appPath}/Contents/Resources/${appIcon}" icon="${appPath}/Contents/Resources/${appIcon}"
echo "Icon before file check: ${icon}" #echo "Icon before file check: ${icon}"
if [ ! -f "${icon}" ]; then if [ ! -f "${icon}" ]; then
# Using LOGO variable to show logo in swiftDialog # Using LOGO variable to show logo in swiftDialog
case $LOGO in case $LOGO in