diff options
| -rw-r--r-- | desktop/pekwm/pekwm.SlackBuild | 6 | ||||
| -rw-r--r-- | desktop/pekwm/pekwm.info | 8 | ||||
| -rw-r--r-- | desktop/pekwm/xinitrc.pekwm | 21 |
3 files changed, 11 insertions, 24 deletions
diff --git a/desktop/pekwm/pekwm.SlackBuild b/desktop/pekwm/pekwm.SlackBuild index 4f661c9019a49..7447a5d9aa266 100644 --- a/desktop/pekwm/pekwm.SlackBuild +++ b/desktop/pekwm/pekwm.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pekwm -VERSION=${VERSION:-0.1.17} -BUILD=${BUILD:-3} +VERSION=${VERSION:-0.1.18} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -72,7 +72,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/desktop/pekwm/pekwm.info b/desktop/pekwm/pekwm.info index 250fd35bc1764..39bf62927b4c8 100644 --- a/desktop/pekwm/pekwm.info +++ b/desktop/pekwm/pekwm.info @@ -1,8 +1,8 @@ PRGNAM="pekwm" -VERSION="0.1.17" -HOMEPAGE="https://web.archive.org/web/20171215085950/http://pekwm.org/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/pekwm-0.1.17.tar.bz2" -MD5SUM="514c04ff1c6123635c00e57443b5e86f" +VERSION="0.1.18" +HOMEPAGE="https://github.com/pekdon/pekwm" +DOWNLOAD="https://github.com/pekdon/pekwm/releases/download/release-0.1.18/pekwm-0.1.18.tar.gz" +MD5SUM="00697ed12201541f5c96b3cf48ca05e2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/pekwm/xinitrc.pekwm b/desktop/pekwm/xinitrc.pekwm index 8337e08883664..d3109b5b690d8 100644 --- a/desktop/pekwm/xinitrc.pekwm +++ b/desktop/pekwm/xinitrc.pekwm @@ -6,22 +6,10 @@ sysresources=/etc/X11/xinit/.Xresources sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi +[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources +[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap +[ -f $userresources ] && /usr/bin/xrdb -merge $userresources +[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap # Start the window manager: if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then @@ -29,4 +17,3 @@ if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then else exec /usr/bin/pekwm fi - |