From 72cf5d3f1c73a999d805605cf85c9afcd5853f59 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 19 Mar 2016 07:35:17 +0100 Subject: [PATCH] base-files: get rid of /etc/profile.d/xdg-*. - xdg-runtime-dir: this is not necessary anymore, XDG_RUNTIME_DIR is set by ConsoleKit2. - xdg-user-dirs: this should be created elsewhere not inconditionally. Close #3374 --- srcpkgs/base-files/files/xdg-runtime-dir.sh | 9 --------- srcpkgs/base-files/files/xdg-user-dirs.sh | 12 ------------ srcpkgs/base-files/template | 2 +- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 srcpkgs/base-files/files/xdg-runtime-dir.sh delete mode 100644 srcpkgs/base-files/files/xdg-user-dirs.sh diff --git a/srcpkgs/base-files/files/xdg-runtime-dir.sh b/srcpkgs/base-files/files/xdg-runtime-dir.sh deleted file mode 100644 index 8a2161d0f67..00000000000 --- a/srcpkgs/base-files/files/xdg-runtime-dir.sh +++ /dev/null @@ -1,9 +0,0 @@ -# Sets and creates XDG_RUNTIME_DIR. - -if [ -z "${XDG_RUNTIME_DIR}" ]; then - export XDG_RUNTIME_DIR=/tmp/${UID:-$(id -u)}-runtime-dir - if [ -w /tmp ] && [ ! -d "${XDG_RUNTIME_DIR}" ]; then - mkdir -p "${XDG_RUNTIME_DIR}" >/dev/null 2>&1 - chmod 0700 "${XDG_RUNTIME_DIR}" >/dev/null 2>&1 - fi -fi diff --git a/srcpkgs/base-files/files/xdg-user-dirs.sh b/srcpkgs/base-files/files/xdg-user-dirs.sh deleted file mode 100644 index 67ed0804d58..00000000000 --- a/srcpkgs/base-files/files/xdg-user-dirs.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -CFGDIR=$HOME/.config - -if [ -f "/usr/bin/xdg-user-dirs-update" ] && [ -f "/usr/bin/xdg-user-dirs-gtk-update" ]; then - if [ ! -f "$CFGDIR/user-dirs.dirs" ] && [ ! -f "$CFGDIR/user-dirs.locale" ]; then - xdg-user-dirs-update - xdg-user-dirs-gtk-update - echo "XDG user dirs created/updated." - fi -fi - diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index 530d31b6ead..74a60393665 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -1,6 +1,6 @@ # Template file for 'base-files' pkgname=base-files -version=0.138 +version=0.139 revision=1 bootstrap=yes depends="xbps-triggers"