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

Jump to bottom

radkys fix for rox pinboard error and resulting mayhem. #984

Merged
merged 1 commit into from
Mar 25, 2017
Merged

radkys fix for rox pinboard error and resulting mayhem. #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions woof-code/rootfs-packages/wallpaper/usr/local/apps/Wallpaper/set_bg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ APPDIR=`dirname "$0"`
cd "${APPDIR}"
APPDIR="`pwd`"
cd "${CURDIR}"

if [ "$1" = "-clear" ];then
cat $HOME/.config/rox.sourceforge.net/ROX-Filer/pb_default | grep -v '<backdrop' > $HOME/.config/wallpaper/pb
mv -f $HOME/.config/wallpaper/pb $HOME/.config/rox.sourceforge.net/ROX-Filer/pb_default
rox -p=default
cat $HOME/Choices/ROX-Filer/PuppyPin | grep -v '<backdrop' > /tmp/tmp
mv -f /tmp/tmp $HOME/Choices/ROX-Filer/PuppyPin
rox -p=$HOME/Choices/ROX-Filer/PuppyPin
echo "[none]" > $HOME/.config/wallpaper/bg_img
exit
fi
Expand All @@ -25,6 +25,7 @@ MODE="`cat $HOME/.config/wallpaper/backgroundmode`"
if [ -x /usr/sbin/background_reshape ];then #legacy compatibility
if [ "$MODE" = "Stretch" ];then
/usr/sbin/background_reshape ${1}
feh --bg-scale $1
fi
fi

Expand Down
17 changes: 9 additions & 8 deletions woof-code/rootfs-skeleton/usr/sbin/set_bg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
#!/bin/sh
#100704 this was originally in Nathan's Wallpaper package.
# called by 'pwallpaper' wallpaper setter.

# Determine the path to this application.
CURDIR="`pwd`"
APPDIR=`dirname "$0"`
cd "${APPDIR}"
APPDIR="`pwd`"
cd "${CURDIR}"

if [ "$1" = "-clear" ];then
grep -v '<backdrop' $HOME/.config/rox.sourceforge.net/ROX-Filer/pb_default > $HOME/.config/wallpaper/pb
mv -f $HOME/.config/wallpaper/pb $HOME/.config/rox.sourceforge.net/ROX-Filer/pb_default
rox -p=default
cat $HOME/Choices/ROX-Filer/PuppyPin | grep -v '<backdrop' > /tmp/tmp
mv -f /tmp/tmp $HOME/Choices/ROX-Filer/PuppyPin
rox -p=$HOME/Choices/ROX-Filer/PuppyPin
echo "[none]" > $HOME/.config/wallpaper/bg_img
exit
fi
Expand All @@ -24,8 +22,11 @@ MODE="`cat $HOME/.config/wallpaper/backgroundmode`"

#w482 BK now have script that truncates an image vertically so that it has the right dimensions
#for a widescreen...
if [ "$MODE" = "Stretch" ];then
/usr/sbin/background_reshape ${1}
if [ -x /usr/sbin/background_reshape ];then #legacy compatibility
if [ "$MODE" = "Stretch" ];then
/usr/sbin/background_reshape ${1}
feh --bg-scale $1
fi
fi

rox --RPC << EOF
Expand Down