Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix hardcoded apps #190

Closed
wants to merge 11 commits into from
Closed

Fix hardcoded apps #190

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
69863f1
Fix hardcoded apps
bilelmoussaoui Oct 23, 2015
139a67c
Fix some issues/typos
bilelmoussaoui Oct 24, 2015
b1c57f8
Should fix the issue
bilelmoussaoui Dec 13, 2015
cdacd53
Avoid double contents
bilelmoussaoui Dec 14, 2015
032b61a
Create hardcoded_apps file if it's not exists
bilelmoussaoui Dec 14, 2015
88d3f12
Forgot to copy icons
bilelmoussaoui Dec 14, 2015
d2bca18
unneeded cp command
bilelmoussaoui Dec 14, 2015
e79a734
Improve the code
bilelmoussaoui Dec 18, 2015
5213d5b
Few fixes
bilelmoussaoui Dec 18, 2015
4af08d7
Remove unneeded code
bilelmoussaoui Dec 18, 2015
516986f
Fixed space indentation
bilelmoussaoui Dec 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
231 changes: 154 additions & 77 deletions fix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,65 @@
# If not, see <http://www.gnu.org/licenses/>.

# Version info
date=201509200 # [year][month][date][extra]
date=201512181 # [year][month][date][extra]

# Locations
username=${SUDO_USER:-$USER}
userhome="/home/$username"

git_locate="https://raw.githubusercontent.com/Foggalong/hardcode-fixer/master"
local_icon="/home/${SUDO_USER:-$USER}/.local/share/icons/hicolor/48x48/apps/"
local_scalable_icon="/home/${SUDO_USER:-$USER}/.local/share/icons/hicolor/scalable/apps/"
global_apps=("/usr/share/applications/" "/usr/local/share/applications/" "/usr/local/share/applications/kde4")
local_apps=("/home/${SUDO_USER:-$USER}/.local/share/applications/" "/home/${SUDO_USER:-$USER}/.local/share/applications/kde4/")

global_apps=("/usr/share/applications/"
"/usr/local/share/applications/"
"/usr/local/share/applications/kde4/")
local_apps=("$userhome/.local/share/applications/"
"$userhome/.local/share/applications/kde4/")

local_icon="$userhome/.local/share/icons/hicolor/48x48/apps/"
global_icon="/usr/share/icons/hicolor/48x48/apps/"
local_scalable_icon="$userhome/.local/share/icons/hicolor/scalable/apps/"
global_scalable_icon="/usr/share/icons/hicolor/scalable/apps/"

steam_icon="${global_icon}steam.png"
hardcoded_apps="hardcoded_apps.csv"

# Allows timeout when launched via 'Run in Terminal'
function gerror() { sleep 3; exit 1; }

# Backup icons
function backup() {
current=$1
new_icon=$2
is_local=$3
extension="${current##*.}"
if [ -f "$current" ]; then # checks if icon exists to copy
if [ "$extension" == "png" ] || [ "$extension" == "xpm" ];then
if [ $is_local == "1" ]; then
if [ ! -f "$local_icon$new_icon" ] ;then
cp "$current" "$local_icon$new_icon"
chown -R $username:$username "$local_icon$new_icon"
fi
else
if [ ! -f "$global_icon$new_icon" ] ;then
cp "$current" "$global_icon$new_icon"
fi
fi
fi
if [ "$extension" == "svg" ];then
if [ $is_local == "1" ]; then
if [ ! -f "$local_scalable_icon$new_icon" ] ;then
cp "$current" "$local_scalable_icon$new_icon"
chown -R $username:$username "$local_scalable_icon$new_icon"
fi
else
if [ ! -f "$global_scalable_icon$new_icon" ] ;then
cp "$current" "$global_scalable_icon$new_icon"
fi
fi
fi
fi
}

# Deals with the flags
if [ -z "$1" ]; then
mode="fix"
Expand Down Expand Up @@ -105,7 +149,7 @@ fi
# Downloads latest version of the list
curl -sk -o "/tmp/tofix.csv" "${git_locate}/tofix.csv"
sed -i -e "1d" "/tmp/tofix.csv" # crops header line
chown "${SUDO_USER:-$USER}" "/tmp/tofix.csv"
chown "$username" "/tmp/tofix.csv"

# Checks for root
if [[ $UID -ne 0 ]] && [ $mode != "local" ]; then
Expand All @@ -125,6 +169,19 @@ if [[ $UID -ne 0 ]] && [ $mode != "local" ]; then
done
fi

if [ ! -f "$hardcoded_apps" ]; then
echo -n "" > $hardcoded_apps
chown -R $username:$username "$hardcoded_apps"
fi

if [ ! -d "$local_scalable_icon" ]; then
su -c "mkdir '$local_scalable_icon' -p" "$username"
fi

if [ ! -d "$local_icon" ]; then
su -c "mkdir '$local_icon' -p" "$username"
fi

# Itterating over lines of tofix.csv, each split into an array
IFS=","
while read -r name launcher current new_icon; do
Expand All @@ -138,131 +195,151 @@ while read -r name launcher current new_icon; do
# Escape non-standard and special characters in file names by creating a new variable
old_icon="${current//\\/\\\\}" # escape backslashes
old_icon="${old_icon//\//\\/}" # escape slashes

# Fixing code
if [ "$current" == "hardcoded" ]; then #checks if the icon path is hardcoded
if [ "$mode" == "local" ]; then
combined_apps=("${local_apps[@]}")
else
combined_apps=("${local_apps[@]}" "${global_apps[@]}")
fi
if [ "$mode" == "local" ]; then
combined_apps=("${local_apps[@]}")
else
combined_apps=("${local_apps[@]}" "${global_apps[@]}")
fi

if [ "$current" == "hardcoded" ]; then
#Get the icon name for hardcoded icons
for app_location in "${combined_apps[@]}"
do
if [ -f "$new_current" ]; then
break
fi
do
if [ -f "$app_location$launcher" ]; then
new_current=$(grep -Gq "Icon=*$" "$app_location$launcher")
new_current=$(grep "^Icon=*" "$app_location$launcher" | sed "s/Icon.*=//")
if [ -f "$new_current" ];then
desktop_file=$(echo "$launcher" | sed "s/\.desktop//")
if ! grep -Gq "$name,$desktop_file,$current,$new_current,$app_location" "$hardcoded_apps";then
echo "$name,$desktop_file,$current,$new_current,$app_location" >> $hardcoded_apps
fi
current=$(echo "$new_current")
old_icon=$(echo "$new_current")
fi
fi
done
if [ -f "$new_current" ];then
sed -i "s/$name,$launcher,$current,$new_icon/$name,$launcher,$new_current,$new_icon/" "tofix.csv"
sed -i "s/$name,$launcher,$current,$new_icon/$name,$launcher,$new_current,$new_icon/" "/tmp/tofix.csv"
fi
fi
if [ ! -d "$local_scalable_icon" ]; then
su -c "mkdir '$local_scalable_icon' -p" "${SUDO_USER:-$USER}"
fi
if [ ! -d "$local_icon" ]; then
su -c "mkdir '$local_icon' -p" "${SUDO_USER:-$USER}"
fi

if [ "$mode" == "fix" ] || [ "$mode" == "local" ]; then
# Local & Steam launchers
for local_app in "${local_apps[@]}"
for local_app in "${combined_apps[@]}"
do
if [ -f "$local_app$launcher" ]; then
if [ "$current" != "steam" ]; then
if [ "$current" != "steam" ] && [ "$current" != "hardcoded" ]; then
if grep -Gq "Icon\s*=\s*$current$" "$local_app$launcher"; then
# Local launchers
echo "L: Fixing $name..."
if [ -f "$current" ]; then # checks if icon exists to copy
if [ ! -d "$local_icon" ]; then
su -c "mkdir '$local_icon' -p" "${SUDO_USER:-$USER}"
fi
if [ "$extension" == "png" ] || [ "$extension" == "xpm" ];then
if [ ! -f "$local_icon$new_icon" ];then
cp "$current" "$local_icon$new_icon"
fi
fi
if [ "$extension" == "svg" ];then
if [ ! -f "$local_scalable_icon$new_icon" ];then
cp "$current" "$local_scalable_icon$new_icon"
fi
fi
fi
sed -i "s/Icon\s*=\s*${old_icon}.*/Icon=$new_icon/" "$local_app$launcher"
backup $current $new_icon "1"
sed -i "s#Icon\s*=\s*${old_icon}.*#Icon=$new_icon#" "$local_app$launcher"
fi
else
elif [ "$current" == "steam" ];then
# Steam launchers
if [ -f "$steam_icon" ]; then # checks if steam icon exists to copy
if grep -Gq "Icon\s*=\s*$current$" "$local_app$launcher"; then
echo "S: Fixing $name..."
if [ ! -d "$local_icon" ]; then
su -c "mkdir '$local_icon' -p" "${SUDO_USER:-$USER}"
fi
if [ ! -f "$local_icon${new_icon}.png" ];then
cp "$steam_icon" "$local_icon${new_icon}.png"
fi
sed -i "s/Icon\s*=\s*steam.*/Icon=$new_icon/" "$local_app$launcher"
sed -i "s#Icon\s*=\s*steam.*#Icon=$new_icon#" "$local_app$launcher"
fi
fi
else
if [ -f "$hardcoded_apps" ];then
while read -r hname hlauncher hcurrent hnew_icon hlocation; do
if [ "$hname" == "$name" ] && [ "$hlocation" == "$local_app" ]; then
echo "H(L): Fixing $name..."
backup $hcurrent $new_icon "1"
sed -i "s#Icon\s*=\s*${hcurrent}.*#Icon=$new_icon#" "$hlocation$launcher"
fi
done < $hardcoded_apps
fi
fi
fi
done
# Global launchers
for global_app in "${global_apps[@]}"
for global_app in "${combined_apps[@]}"
do
if [ $mode != "local" ] && [ -f "$global_app$launcher" ]; then
if [ "$current" != "hardcoded" ];then
if grep -Gq "Icon\s*=\s*$current$" "$global_app$launcher"; then
echo "G: Fixing $name..."
if [ -f "$current" ]; then # checks if icon exists to copy
if [ "$extension" == "png" ] || [ "$extension" == "xpm" ];then
if [ ! -f "$global_icon$new_icon" ] ;then
cp "$current" "$global_icon$new_icon"
fi
fi
if [ "$extension" == "svg" ];then
if [ ! -f "$global_scalable_icon$new_icon" ];then
cp "$current" "$global_scalable_icon$new_icon"
fi
backup $current $new_icon "1"
sed -i "s#Icon\s*=\s*${old_icon}.*#Icon=$new_icon#" "$global_app$launcher"
fi
else
if [ -f "$hardcoded_apps" ]; then
while read -r hname hlauncher hcurrent hnew_icon hlocation; do
if [ "$hname" == "$name" ] && [ "$hlocation" == "$global_app" ]; then
echo "H(G): Fixing $name..."
backup $hcurrent $new_icon "1"
sed -i "s#Icon\s*=\s*${hcurrent}.*#Icon=$new_icon#" "$hlocation$launcher"
fi
fi
sed -i "s/Icon\s*=\s*${old_icon}.*/Icon=$new_icon/g" "$global_app$launcher"
done < $hardcoded_apps
fi
fi
fi
done
# Reversion code
elif [ "$mode" == "revert" ] || [ "$mode" == "l-revert" ]; then
# Local revert
for local_app in "${local_apps[@]}"
for local_app in "${combined_apps[@]}"
do
if [ -f "$local_app$launcher" ]; then
if grep -Gq "Icon\s*=\s*$new_icon$" "$local_app$launcher"; then
echo "F: Reverting $name..."
rm -f "$local_icon$new_icon"*
rm -f "$local_scalable_icon$new_icon"*
sed -i "s/Icon=${new_icon}.*/Icon=$old_icon/" "$local_app$launcher"
if [ "$old_icon" != "hardcoded" ]; then
echo "F: Reverting $name..."
rm -f "$local_icon$new_icon"*
rm -f "$local_scalable_icon$new_icon"*
sed -i "s#Icon=${new_icon}.*#Icon=$old_icon#" "$local_app$launcher"
fi
fi
fi
# Steam revert
if [ -f "$local_app$launcher" ] && [ -f "$steam_icon" ]; then
if grep -Gq "Icon\s*=\s*$new_icon$" "$local_app$launcher"; then
echo "S: Reverting $name..."
rm -f "$local_icon$new_icon"*
rm -f "$local_scalable_icon$new_icon"*
sed -i "s/Icon\s*=\s*${new_icon}.*/Icon=$old_icon/" "$local_app$launcher"
if [ "$old_icon" != "hardcoded" ]; then
echo "S: Reverting $name..."
rm -f "$local_icon$new_icon"*
rm -f "$local_scalable_icon$new_icon"*
sed -i "s#Icon\s*=\s*${new_icon}.*#Icon=$old_icon#" "$local_app$launcher"
fi
fi
fi
# Hardcoded revert
if [ "$old_icon" == "hardcoded" ] && [ -f "$hardcoded_apps" ]; then
while read -r hname hlauncher hcurrent hnew_icon hlocation; do
if [ "$hname" == "$name" ] && [ "$hlocation" == "$local_app" ]; then
if [ -f "$hlocation$launcher" ];then
echo "F: Reverting $name..."
sed -i "s#Icon=${new_icon}.*#Icon=$hnew_icon#" "$hlocation$launcher"
fi
fi
done < $hardcoded_apps
fi
done
# Global revert
for global_app in "${global_apps[@]}"
for global_app in "${combined_apps[@]}"
do
if [ $mode != "l-revert" ] && [ -f "$global_app$launcher" ]; then
if grep -Gq "Icon\s*=\s*$new_icon$" "$global_app$launcher"; then
echo "G: Reverting $name..."
rm -f "$global_icon$new_icon"*
rm -f "$global_scalable_icon$new_icon"*
sed -i "s/Icon\s*=\s*${new_icon}.*/Icon=$old_icon/" "$global_app$launcher"
if [ "$old_icon" != "hardcoded" ]; then
echo "G: Reverting $name..."
rm -f "$global_icon$new_icon"*
rm -f "$global_scalable_icon$new_icon"*
sed -i "s#Icon\s*=\s*${new_icon}.*#Icon=$old_icon#" "$global_app$launcher"
fi
fi
# Hardcoded revert
if [ "$old_icon" == "hardcoded" ] && [ -f "$hardcoded_apps" ] ; then
while read -r hname hlauncher hcurrent hnew_icon hlocation; do
if [ "$hname" == "$name" ] && [ "$hlocation" == "$global_app" ]; then
if [ -f "$hlocation$launcher" ];then
echo "F: Reverting $name..."
sed -i "s#Icon=${new_icon}.*#Icon=$hnew_icon#" "$hlocation$launcher"
fi
fi
done < $hardcoded_apps
fi
fi
done
Expand Down