chakra-common huge cleanup

removed all the update-*.sh scripts not required anymore. The pacman hooks now are able to handle the icons and mime automatically
sysinfo.sh removed, we use inxi
This commit is contained in:
AlmAck 2018-06-24 13:21:10 +02:00
parent fb7b6109cc
commit 3eea18d741
16 changed files with 7 additions and 327 deletions

View File

@ -5,7 +5,7 @@ Comment[da]=Chakra fejlsporingssystem
Comment[it]=Sistema di tracciatura errori di Chakra
Comment[nl]=Chakra Bug Tracking System
Comment[ja]=Chakra
Exec=xdg-open https://chakralinux.org/bugtracker/
Exec=xdg-open https://code.chakralinux.org/groups/packages/-/issues
Icon=kbugbuster
Name=Bugs
Name[ca]=Errors

View File

@ -5,7 +5,7 @@ Comment[da]=Chakra pakkeændringslogge
Comment[it]=Registro cambiamenti nei pacchetti di Chakra
Comment[nl]=Chakra pakket wijziging logs
Comment[ja]=Chakra
Exec=xdg-open https://chakralinux.org/code/
Exec=xdg-open https://code.chakralinux.org
Icon=utilities-log-viewer
Name=Package ChangeLogs
Name[ca]=Registre de canvis a paquets

View File

@ -5,7 +5,7 @@ Comment=Chakra kodearkiv
Comment[it]=Repository del Codice di Chakra
Comment[nl]=Chakra code Repository
Comment[ja]=Chakra
Exec=xdg-open https://chakralinux.org/code/
Exec=xdg-open https://code.chakralinux.org
Icon=preferences-system
Name=Code
Name[ca]=Codi

View File

@ -5,7 +5,7 @@ Comment[da]=Chakra dokumentation
Comment[it]=Documentazione di Chakra
Comment[nl]=Chakra documentatie
Comment[ja]=Chakra
Exec=xdg-open https://www.chakralinux.org/wiki/
Exec=xdg-open https://community.chakralinux.org/c/tutorials
Icon=system-help
Name=Documentation
Name[ca]=Documentació

View File

@ -3,7 +3,7 @@
pkgname=chakra-common
arch=('x86_64')
pkgver=18.04.2
pkgrel=1
pkgrel=2
pkgdesc="Common configuration files, scripts and artwork"
url="http://chakralinux.org"
license=('GPL' 'BSD')
@ -22,12 +22,6 @@ source=('Chakra-Bugs.desktop'
'Chakra-Forum.desktop'
'Chakra-Homepage.desktop'
'Chakra.directory'
'chakra-config-updater.sh'
'chakra-update-icons.sh'
'chakra-update-mime.sh'
'chakra-update-sycoca.sh'
'chakra-update-user-sycoca.sh'
'chakra-sysinfo.sh'
#'chakra-backup.sh'
#'Chakra-backup.desktop'
'updates.conf'
@ -59,23 +53,10 @@ package() {
# Install scripts for kf5
install -D -m755 -o root -g root $srcdir/kde4.sh $pkgdir/etc/xdg/plasma-workspace/env/kde4.sh
# Install configuration updater scripts
install -D -m755 -o root -g root ${srcdir}/chakra-config-updater.sh ${pkgdir}/usr/bin/chakra-config-updater
install -D -m755 -o root -g root ${srcdir}/chakra-update-icons.sh ${pkgdir}/usr/bin/chakra-update-icons
install -D -m755 -o root -g root ${srcdir}/chakra-update-mime.sh ${pkgdir}/usr/bin/chakra-update-mime
install -D -m755 -o root -g root ${srcdir}/chakra-update-sycoca.sh ${pkgdir}/usr/bin/chakra-update-sycoca
install -D -m755 -o root -g root ${srcdir}/chakra-update-user-sycoca.sh ${pkgdir}/usr/bin/chakra-update-user-sycoca
# Install sysinfo script
install -D -m755 -o root -g root ${srcdir}/chakra-sysinfo.sh ${pkgdir}/usr/bin/chakra-sysinfo
# Install backup script
#install -D -m755 -o root -g root ${srcdir}/chakra-backup.sh ${pkgdir}/usr/bin/chakra-backup
#install -D -m644 -o root -g root ${srcdir}/Chakra-backup.desktop ${pkgdir}/usr/share/applications/Chakra-backup.desktop
# Install config file for updates
install -D -m755 -o root -g root ${srcdir}/updates.conf ${pkgdir}/etc/chakra/updates.conf
# Install Chakra icons
cd ${srcdir}/chakra-icons/
mkdir -p ${pkgdir}/usr/share/icons/hicolor/scalable/apps/

View File

@ -1,13 +0,0 @@
#!/bin/sh
#
# This file is executed at kde shutdown.
# Uncomment the following lines to kill the agents
# that were started at session startup.
if [ -x /usr/bin/gpgconf ]; then
/usr/bin/gpgconf --kill gpg-agent
fi
#
if [ "${SSH_AGENT_PID}" ]; then
ssh-agent -k
fi

View File

@ -1,19 +0,0 @@
# Agents startup file
#
# This file is sourced at kde startup, so that
# the environment variables set here are available
# throughout the session.
# Uncomment the following lines to start gpg-agent
# and/or ssh-agent at kde startup.
# If you do so, do not forget to uncomment the respective
# lines in KDEDIR/shutdown/agent-shutdown.sh to
# properly kill the agents when the session ends.
if [ -x /usr/bin/gpg-agent -a -x /usr/bin/pinentry-qt ]; then
/usr/bin/gpg-agent --daemon --pinentry-program /usr/bin/pinentry-qt
fi
#
if [ -x /usr/bin/ssh-agent ]; then
eval "$(/usr/bin/ssh-agent -s)"
fi

View File

@ -1,5 +0,0 @@
#!/bin/sh
if [ -x /usr/bin/akonadictl ]; then
/usr/bin/akonadictl stop
fi

View File

@ -10,20 +10,16 @@ post_install() {
echo " Website: https://chakralinux.org"
echo " News: https://community.chakralinux.org/c/news"
echo " Forum: https://community.chakralinux.org"
echo " Bugtracker: https://code.chakralinux.org"
echo " Bugtracker: https://code.chakralinux.org/groups/packages/-/issues"
echo " CCR: https://chakralinux.org/ccr/"
echo " Changelogs: https://community.chakralinux.org/tags/release"
echo " "
}
post_upgrade() {
post_install $1
post_install
}
post_remove() {
/bin/true
}
op=$1
shift
$op $*

View File

@ -1,51 +0,0 @@
#!/bin/bash
update_xdg_icons() {
echo -n ":: Rebuilding icon database ..."
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
echo " DONE"
}
update_mime_db() {
echo -e -n ":: Rebuilding MIME database ..."
update-mime-database /usr/share/mime &>/dev/null
echo -e " DONE"
}
launch_dbus() {
local _i
for _i in $(dbus-launch); do
export "${_i}";
done
}
rebuild_global_config_cache() {
echo -e -n ":: Rebuilding global config cache ..."
launch_dbus &> /dev/null
/usr/bin/kbuildsycoca4 --global --noincremental &> /dev/null
/usr/bin/kbuildsycoca5 --global --noincremental &> /dev/null
kill ${DBUS_SESSION_BUS_PID}
unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
echo -e " DONE"
}
if [ $UID -ne 0 ]; then
echo " "
echo "Only root can run $0"
echo " "
exit 1
fi
echo " "
echo " > Chakra global config updater"
echo " ----------------------------"
update_mime_db
update_xdg_icons
rebuild_global_config_cache
echo ":: All done!"
echo " "

View File

@ -1,104 +0,0 @@
#!/bin/bash
_user=`whoami`
get_data() {
echo
echo
echo "################################################################################"
echo "## Chakra Sysinfo ##"
echo "################################################################################"
echo
echo -n "Release: "
cat /etc/issue |sed '/Arch/!d; s/\([^\\]*\).*/\1/g'
echo -n "Platform: "
uname -m
echo
echo
echo "CPU data:"
echo "--------------------------------------------------------------------------------"
cat /proc/cpuinfo |egrep 'vendor|model name|MHz|cache size'
echo
echo
echo "RAM data (MiB):"
echo "--------------------------------------------------------------------------------"
free -m
echo
echo
echo "PCI devices:"
echo "--------------------------------------------------------------------------------"
lspci
echo
echo
echo "USB devices:"
echo "--------------------------------------------------------------------------------"
lsusb |grep -v 0000:0000
echo
echo
echo "Disk space:"
echo "--------------------------------------------------------------------------------"
echo -n "Available: "
df -k|grep -v '/dev/shm' |awk -- '{ print $2 }'| sed -e '1d; s/$/+/g;'| xargs -L 100 | awk -- '{ print "("$0,"0 )/1024/1024" }'|bc |tr '\n' ' '
echo "GiB"
echo -n "Used: "
df -k|grep -v '/dev/shm' |awk -- '{ print $3 }'| sed -e '1d; s/$/+/g;'| xargs -L 100 | awk -- '{ print "("$0,"0 )/1024/1024" }'|bc |tr '\n' ' '
echo "GiB"
echo -n "Free: "
df -k|grep -v '/dev/shm' |awk -- '{ print $4 }'| sed -e '1d; s/$/+/g;'| xargs -L 100 | awk -- '{ print "("$0,"0 )/1024/1024" }'|bc |tr '\n' ' '
echo "GiB"
echo
echo
echo "Kernel info:"
echo "--------------------------------------------------------------------------------"
uname -s -r -v
echo
echo
echo "Kernel Modules:"
echo "--------------------------------------------------------------------------------"
lsmod| sed -e '1d;' | awk -- '{ print $1 }'| sort| uniq |xargs -n 3|awk -- '{ printf("%-25s %-25s %-25s\n", $1, $2, $3) }'
echo
echo
echo "Uptime and Load average:"
echo "--------------------------------------------------------------------------------"
uptime
echo
echo
echo "Chakra Packages"
echo "--------------------------------------------------------------------------------"
pacman -Q
echo
echo
echo "testdb output"
echo "--------------------------------------------------------------------------------"
testdb
echo
echo
echo "EOF"
}
echo
echo ":: collecting data"
get_data > ~/chakra-sysinfo.txt
echo ":: system info saved to /home/$_user/chakra-sysinfo.txt"
echo

View File

@ -1,17 +0,0 @@
#!/bin/bash
update_xdg_icons() {
echo -n " > Rebuilding xdg icon database ..."
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
echo " DONE"
}
if [ $UID -ne 0 ]; then
echo " "
echo "Only root can run $0"
echo " "
exit 1
fi
update_xdg_icons

View File

@ -1,17 +0,0 @@
#!/bin/bash
update_mime_db() {
echo -e -n " > Rebuilding MIME database ..."
update-mime-database /usr/share/mime &>/dev/null
echo -e " DONE"
}
if [ $UID -ne 0 ]; then
echo " "
echo "Only root can run $0"
echo " "
exit 1
fi
update_mime_db

View File

@ -1,33 +0,0 @@
#!/bin/bash
launch_dbus() {
local _i
for _i in $(dbus-launch); do
export "${_i}";
done
}
rebuild_global_config_cache() {
echo -e -n " > Rebuilding global configuration cache ..."
launch_dbus &> /dev/null
/usr/bin/kbuildsycoca4 --global --noincremental &> /dev/null
/usr/bin/kbuildsycoca5 --global --noincremental &> /dev/null
kill ${DBUS_SESSION_BUS_PID}
unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
echo -e " DONE"
}
if [ $UID -ne 0 ]; then
echo " "
echo "Only root can run $0"
echo " "
exit 1
fi
rebuild_global_config_cache

View File

@ -1,27 +0,0 @@
#!/bin/bash
rebuild_user_config_cache() {
current_users=`LC_ALL=C w | cut -d " " -f 1 | grep -v USER | sed -e '/^$/d' | uniq`
for victim in $current_users
do
if [ -d "/home/$victim/.kde4" ] ; then
echo -e -n " > Rebuilding configuration cache for user: $victim ..."
pushd /home/$victim &> /dev/null
su -c kbuildsycoca4 $victim &> /dev/null
su -c kbuildsycoca5 $victim &> /dev/null
popd &> /dev/null
echo " DONE"
fi
done
}
if [ $UID -ne 0 ]; then
echo " "
echo "Only root can run $0"
echo " "
exit 1
fi
rebuild_user_config_cache

View File

@ -1,11 +0,0 @@
# This config file controls the behaviour of Chakra's
# postinstall scripts during installation/upgrade(s).
# update mime and icon database
UPDATE_XDG_ICON_DB="yes"
# run kbuildsycoca4 for all currently logged-in users
UPDATE_USER_CONFIG="no"
# update KDE's global system config cache
UPDATE_GLOBAL_CONFIG="no"