Skip to content

Remove '-r' flag usage in configure script #226

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

Open
LaurentTreguier wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove '-r' flag usage in configure script #226

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d737a12
always use relative symlinks
LaurentTreguier Aug 27, 2017
c9a24ee
remove non-posix '-r' flag usage
LaurentTreguier Aug 29, 2017
d81d87e
Merge branch 'master' of https://github.com/keeferrourke/la-capitaine…
LaurentTreguier Aug 29, 2017
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
32 changes: 16 additions & 16 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,36 +89,36 @@ case $yn in
rm "$wd/actions/22x22" "$wd/devices/scalable" "$wd/panel/16" \
"$wd/panel/24" "$wd/places/16x16" "$wd/status/scalable"

ln -sfr "$wd/actions/22x22-dark" "$wd/actions/22x22"
ln -sfr "$wd/devices/scalable-dark" "$wd/devices/scalable"
ln -sfr "$wd/emblems/scalable/avatar-default-dark.svg" "$wd/emblems/scalable/avatar-default.svg"
ln -sfr "$wd/places/16x16-dark" "$wd/places/16x16"
ln -sfr "$wd/status/scalable-dark" "$wd/status/scalable"
ln -sf "22x22-dark" "$wd/actions/22x22"
ln -sf "scalable-dark" "$wd/devices/scalable"
ln -sf "avatar-default-dark.svg" "$wd/emblems/scalable/avatar-default.svg"
ln -sf "16x16-dark" "$wd/places/16x16"
ln -sf "scalable-dark" "$wd/status/scalable"
echo "Updated theme to use icons for dark GTK+ themes."
;;

* )
rm "$wd/actions/22x22" "$wd/devices/scalable" "$wd/panel/16" \
"$wd/panel/24" "$wd/places/16x16" "$wd/status/scalable"

ln -sfr "$wd/actions/22x22-light" "$wd/actions/22x22"
ln -sfr "$wd/devices/scalable-light" "$wd/devices/scalable"
ln -sfr "$wd/emblems/scalable/avatar-default-light.svg" "$wd/emblems/scalable/avatar-default.svg"
ln -sfr "$wd/places/16x16-light" "$wd/places/16x16"
ln -sfr "$wd/status/scalable-light" "$wd/status/scalable"
ln -sf "22x22-light" "$wd/actions/22x22"
ln -sf "scalable-light" "$wd/devices/scalable"
ln -sf "avatar-default-light.svg" "$wd/emblems/scalable/avatar-default.svg"
ln -sf "16x16-light" "$wd/places/16x16"
ln -sf "scalable-light" "$wd/status/scalable"
echo "Updated theme to use icons for light GTK+ themes."
;;
esac
read -p "Use icons for a dark coloured panel? [y/N] " yn
case $yn in
[Yy]* )
ln -sfr "$wd/panel/16-dark" "$wd/panel/16"
ln -sfr "$wd/panel/24-dark" "$wd/panel/24"
ln -sf "16-dark" "$wd/panel/16"
ln -sf "24-dark" "$wd/panel/24"
echo "Updated theme to use dark icons for the panel."
;;
* )
ln -sfr "$wd/panel/16-light" "$wd/panel/16"
ln -sfr "$wd/panel/24-light" "$wd/panel/24"
ln -sf "16-light" "$wd/panel/16"
ln -sf "24-light" "$wd/panel/24"
echo "Updated theme to use light icons for the panel."
;;
esac
Expand Down Expand Up @@ -157,8 +157,8 @@ ln -sf distributor-logo.svg start-here.svg # fixes potentially broken link

cd "$wd"

ln -sfr "$wd"/places/scalable/distributor-logo.svg "$wd"/apps/scalable/cs-desktop.svg
ln -sfr "$wd"/places/scalable/distributor-logo.svg "$wd"/apps/scalable/applications-system.svg
ln -sf ../../places/scalable/distributor-logo.svg "$wd"/apps/scalable/cs-desktop.svg
ln -sf ../../places/scalable/distributor-logo.svg "$wd"/apps/scalable/applications-system.svg

echo "Updated distributor logo."

Expand Down