diff options
| -rw-r--r-- | abs/core/linhes-scripts/PKGBUILD | 14 | ||||
| -rwxr-xr-x | abs/core/linhes-scripts/upgrade_linhes.sh | 153 | ||||
| -rw-r--r-- | abs/core/linhes-scripts/upgrade_linhes_script.sh | 167 | ||||
| -rw-r--r-- | abs/core/linhes-scripts/upgrade_screen_rc | 9 | ||||
| -rw-r--r-- | abs/extra/screen/PKGBUILD | 48 | ||||
| -rw-r--r-- | abs/extra/screen/screen-4.0.3-caption-colors.patch | 21 | ||||
| -rw-r--r-- | abs/extra/screen/screen-4.0.3-long-term.patch | 24 | ||||
| -rw-r--r-- | abs/extra/screen/screen.install | 21 | ||||
| -rw-r--r-- | abs/extra/screen/screen.pam | 1 |
9 files changed, 322 insertions, 136 deletions
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index e8aebcc..020bfa8 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,11 +3,11 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=11 +pkgrel=13 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') -depends=('xosd' 'cpulimit') +depends=('xosd' 'cpulimit' 'screen') url="http://linhes.org/" install="linhes-scripts.install" source=( @@ -45,12 +45,16 @@ dct700-cc.sh qip7100-cc.sh dtheme.sh xwin_find.sh +upgrade_screen_rc +upgrade_linhes_script.sh ) build() { cd ${srcdir} install -d ${pkgdir}/usr/LH/bin + install -d ${pkgdir}/usr/LH/etc install -D -m755 myth2* *.sh *.pl *.py vdpau* run-* pause_* ${pkgdir}/usr/LH/bin/ + install -D -m755 upgrade_screen_rc ${pkgdir}/usr/LH/etc/ mkdir -p ${pkgdir}/etc/sv/pause-mythcommflag/supervise cp run-pause-mythcommflag ${pkgdir}/etc/sv/pause-mythcommflag/run mkdir -p ${pkgdir}/etc/sv/limit-mythcommflag/supervise @@ -83,7 +87,7 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' '460861e6d0cf999629b734912eea0acf' 'ccca6bdbbd86b203a3eecdbbe363e701' '65629302a4d2c3adf88cdf0ebc10d493' - '2734054f08c4c885bb9070dce239d4c3' + '6f87efdcf44cd97447bbed94854bae1f' '87b0dc855181f98516acb18a7d551601' 'c54a3afd4aa3c1af560c9b6adb600f3a' '2fb25aef03ffd1282414d8cca3df7056' @@ -91,4 +95,6 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' 'df727c98350a64e2171c950bbefc9c5d' '7b890e7044db38e8d439f67e398af206' '35693f50939d5827aeabfce8c5dce589' - 'a94fe6d980f4b810f2e2ae5352084b39') + 'a94fe6d980f4b810f2e2ae5352084b39' + '974c137d3fcb85942ba8945a1bc815fe' + '0f918d7bf4dfa81acbe2b4854e91c82c') diff --git a/abs/core/linhes-scripts/upgrade_linhes.sh b/abs/core/linhes-scripts/upgrade_linhes.sh index 91a46e6..933d994 100755 --- a/abs/core/linhes-scripts/upgrade_linhes.sh +++ b/abs/core/linhes-scripts/upgrade_linhes.sh @@ -1,136 +1,25 @@ #!/bin/bash -#Script to facilitate easy upgrade to latest LinHES. -clear -if [ "$(id -u)" != "0" ]; then - echo "This script must be run as root" 1>&2 - exit 1 -fi -function pause(){ - read -p "$*" -} -echo "The script will guide you thru the process of upgrading to the latest LinHES." -pause 'Press <ENTER> to continue...' -echo -echo "Sync'n with the repos..." -echo -pacman -Sy &>/dev/null -pacman -Qu > /tmp/linhes_upgrade -if [ ! -s /tmp/linhes_upgrade ] -then - echo "No upgrades found. This could mean the repository is busy." - echo "Or your system is already up to date." - echo "If you have not upgrade, please try again later." - echo "Starting the backend." - sv start mythbackend &>/dev/null - exit 1 -fi -if grep -E "Master|Stand" /etc/systemconfig &>/dev/null - then - echo "Stopping the backend." - sv stop mythbackend &>/dev/null -fi -if pacman -Qs mythvodka &>/dev/null - then - echo "Removing MythVodka if installed as it is no longer compatible with MythTV." - echo - pacman -R mythvodka &>/dev/null -fi -echo -echo "Backing up Online Streams listings." -echo -cp /usr/share/mythtv/is.xml /usr/share/mythtv/is.xml.021 -echo "Removing mythcontrol and mythphone if installed." -echo -if pacman -Qs mythcontrols &>/dev/null - then - pacman -R mythcontrols &>/dev/null -fi -if pacman -Qs mythphone &>/dev/null - then - pacman -R mythphone &>/dev/null -fi -if grep -q kernel26 /tmp/linhes_upgrade +mkfifo /tmp/upgrade.fifo + +set | grep -q WINDOWID +status=$? + +if [ $status = 0 ] then - echo "Upgrading the kernel." - echo - if pacman -Qs v4l-dvb &>/dev/null - then - pacman -Sf --noconfirm kernel26 &>/dev/null && pacman -Sf --noconfirm v4l-dvb - else - pacman -S kernel26 --noconfirm &>/dev/null - fi + echo "This script must run from the console" 1>&2 + exit 1 fi -if grep -q v4l-dvb /tmp/linhes_upgrade + + +if [ "$(id -u)" != "0" ]; then - pacman -Sf --noconfirm v4l-dvb &>/dev/null -fi -echo "Checking for VDPAU packages and upgrading if needed." -echo -if pacman -Qs vdpinfo-71xx &>/dev/null - then - pacman -Rd vdpinfo-71xx &>/dev/null -fi -if pacman -Qs vdpinfo-96xx &>/dev/null - then - pacman -Rd vdpinfo-96xx &>/dev/null -fi -if pacman -Qs vdpinfo &>/dev/null - then - pacman -Rd vdpinfo &>/dev/null && pacman -S --noconfirm nvidia &>/dev/null && pacman -S --noconfirm vdpauinfo &>/dev/null -fi -echo "Performing complete system upgrade." -echo "This may take some time depending on your connection speed." -echo "Server bandwidth utilization will also have an affect." -echo "Please be patient." -echo -pacman -Suf --noconfirm &>/dev/null -echo "Restoring Online Streams listings." -echo -cp /usr/share/mythtv/is.xml.021 /usr/share/mythtv/is.xml -if grep -E "Master|Stand" /etc/systemconfig &>/dev/null - then - echo "Starting the backend. This will automatically update the schema." - sv start mythbackend &>/dev/null - echo "I'll launch an xterm so you watch output backend log." - echo "Once the schema updates are complete, switch back to this xterm." - echo -e "\033[1mWhen you see \"Upgrading to MythTV schema version 1254\"\033[0m" - echo "You can switch back to this xterm." - echo -e "\033[1mNote:After pressing <ENTER>, I'll be asleep for 30 secs...\033[0m" - echo -e "\033[1mThis will give the schema time to upgrade.\033[0m" - pause 'Press <ENTER> to continue...' - xterm -fn *18* -e tail -f /var/log/mythtv/mythbackend.log & - #Sleeping for 30 seconds to give the schema time to upgrade.... - sleep 30 - read -p "Press <ENTER> to continue once the schema upgrade is complete." - echo - echo -e "\033[1mNow, the frontend will launch to update the schema for any plugins.\033[0m" - echo -e "\033[1mOnce the this is done, please exit the frontend.\033[0m" - pause 'Press <ENTER> to continue...' - xterm -e mythfrontend - echo - echo "Performing LinHES specific schema updates." - echo - /usr/LH/bin/update_schema_021_to_022.sh - cat /data/database/dvd_transcode_r6.sql | mysql -u root mythconverg - /usr/LH/bin/mythwelcome-config.py -fi -echo "All done!" -echo -e "\033[5mThanks for choosing LinHES!\033[0m" -if grep -q kernel26 /tmp/linhes_upgrade -then - echo "The kernel was upgraded, we need to reboot." - pause "Press <ENTER> to reboot." - reboot -else - if grep -q v4l-dvb /tmp/linhes_upgrade - then - echo "The V4L\DVB modules were upgraded." - pause "Press <ENTER> to reboot." - reboot - else - echo "Launching mythfrontend once again!" - echo "Enjoy the latest version!" - sleep 5 - mythfrontend -fi -fi + echo "This script must be run as root" 1>&2 + exit 1 + +fi + + +sv stop mythbackend +sv stop frontend + +screen -c /usr/LH/etc/upgrade_screen_rc
\ No newline at end of file diff --git a/abs/core/linhes-scripts/upgrade_linhes_script.sh b/abs/core/linhes-scripts/upgrade_linhes_script.sh new file mode 100644 index 0000000..ffee1ae --- /dev/null +++ b/abs/core/linhes-scripts/upgrade_linhes_script.sh @@ -0,0 +1,167 @@ +#!/bin/bash +#Script to facilitate easy upgrade to latest LinHES. +LOGFILE=/tmp/upgrade.fifo +clear + + + +if [ "$(id -u)" != "0" ]; then + echo "This script must be run as root" 1>&2 + exit 1 + +fi + + +function pause(){ + read -p "$*" +} + + +echo "The script will guide you thru the process of upgrading to the latest LinHES." +pause 'Press <ENTER> to continue...' +echo +echo "Sync'n with the repos..." +echo +pacman -Sy >>$LOGFILE 2>>$LOGFILE + +echo "Updating pacman" +pacman -S --noconfirm pacman >> $LOGFILE +echo "Updating pacman database to new format" +pacman-db-upgrade >>$LOGFILE + +echo "Removing misc outdated packages " +pacman -R --noconfirm aufs-utils aufs >> $LOGFILE +pacman -R --noconfirm xf86-video-sis >> $LOGFILE +pacman -R --noconfirm madwifi >> $LOGFILE + + +echo "Resyncing with repository" +pacman -Syyyy > $LOGFILE +pacman -Qu > /tmp/linhes_upgrade +if [ ! -s /tmp/linhes_upgrade ] +then + echo "No upgrades found. This could mean the repository is busy." + echo "Or your system is already up to date." + echo "If you have not upgrade, please try again later." + echo "Starting the backend." + sv start mythbackend &>/dev/null + exit 1 +fi +if grep -E "Master|Stand" /etc/systemconfig &>/dev/null + then + echo "Stopping the backend." + sv stop mythbackend &>/dev/null +fi +if pacman -Qs mythvodka &>/dev/null + then + echo "Removing MythVodka if installed as it is no longer compatible with MythTV." + echo + pacman -R mythvodka &>/dev/null +fi +echo +echo "Backing up Online Streams listings." +echo +cp /usr/share/mythtv/is.xml /usr/share/mythtv/is.xml.021 +echo "Removing mythcontrol and mythphone if installed." +echo +if pacman -Qs mythcontrols &>/dev/null + then + pacman -R mythcontrols &>/dev/null +fi +if pacman -Qs mythphone &>/dev/null + then + pacman -R mythphone &>/dev/null +fi + +# if grep -q kernel26 /tmp/linhes_upgrade +# then +# echo "Upgrading the kernel." +# echo +# if pacman -Qs v4l-dvb &>/dev/null +# then +# pacman -Sf --noconfirm kernel26 &>/dev/null && pacman -Sf --noconfirm v4l-dvb +# else +# pacman -S kernel26 --noconfirm &>/dev/null +# fi +# fi +# if grep -q v4l-dvb /tmp/linhes_upgrade +# then +# pacman -Sf --noconfirm v4l-dvb &>/dev/null +# fi +# echo "Checking for VDPAU packages and upgrading if needed." +# echo +# if pacman -Qs vdpinfo-71xx &>/dev/null +# then +# pacman -Rd vdpinfo-71xx &>/dev/null +# fi +# if pacman -Qs vdpinfo-96xx &>/dev/null +# then +# pacman -Rd vdpinfo-96xx &>/dev/null +# fi +# if pacman -Qs vdpinfo &>/dev/null +# then +# pacman -Rd vdpinfo &>/dev/null && pacman -S --noconfirm nvidia &>/dev/null && pacman -S --noconfirm vdpauinfo &>/dev/null +# fi +echo "Performing complete system upgrade." +echo "This may take some time depending on your connection speed." +echo "Server bandwidth utilization will also have an affect." +echo "Please be patient." +echo +pacman -Su --noconfirm 2>$LOGFILE > $LOGFILE +echo "Restoring Online Streams listings." +echo +cp /usr/share/mythtv/is.xml.021 /usr/share/mythtv/is.xml +# if grep -E "Master|Stand" /etc/systemconfig &>/dev/null +# then +# echo "Starting the backend. This will automatically update the schema." +# sv start mythbackend &>/dev/null +# echo "I'll launch an xterm so you watch output backend log." +# echo "Once the schema updates are complete, switch back to this xterm." +# echo -e "\033[1mWhen you see \"Upgrading to MythTV schema version 1254\"\033[0m" +# echo "You can switch back to this xterm." +# echo -e "\033[1mNote:After pressing <ENTER>, I'll be asleep for 30 secs...\033[0m" +# echo -e "\033[1mThis will give the schema time to upgrade.\033[0m" +# pause 'Press <ENTER> to continue...' +# xterm -fn *18* -e tail -f /var/log/mythtv/mythbackend.log & +# #Sleeping for 30 seconds to give the schema time to upgrade.... +# sleep 30 +# read -p "Press <ENTER> to continue once the schema upgrade is complete." +# echo +# echo -e "\033[1mNow, the frontend will launch to update the schema for any plugins.\033[0m" +# echo -e "\033[1mOnce the this is done, please exit the frontend.\033[0m" +# pause 'Press <ENTER> to continue...' +# xterm -e mythfrontend +# echo +# echo "Performing LinHES specific schema updates." +# echo +# /usr/LH/bin/update_schema_021_to_022.sh +# cat /data/database/dvd_transcode_r6.sql | mysql -u root mythconverg +# /usr/LH/bin/mythwelcome-config.py +# fi +echo "All done!" + + + +echo -e "\033[5mThanks for choosing LinHES!\033[0m" + #echo "The kernel was upgraded, we need to reboot." + pause "Press <ENTER> to reboot." + reboot + +# if grep -q kernel26 /tmp/linhes_upgrade +# then +# echo "The kernel was upgraded, we need to reboot." +# pause "Press <ENTER> to reboot." +# reboot +# else +# if grep -q v4l-dvb /tmp/linhes_upgrade +# then +# echo "The V4L\DVB modules were upgraded." +# pause "Press <ENTER> to reboot." +# reboot +# else +# echo "Launching mythfrontend once again!" +# echo "Enjoy the latest version!" +# sleep 5 +# mythfrontend +# fi +# fi diff --git a/abs/core/linhes-scripts/upgrade_screen_rc b/abs/core/linhes-scripts/upgrade_screen_rc new file mode 100644 index 0000000..8c49a8d --- /dev/null +++ b/abs/core/linhes-scripts/upgrade_screen_rc @@ -0,0 +1,9 @@ +bind j focus down +bind k focus up +startup_message off +screen -t upgrade bash -c "upgrade_linhes_script.sh" +split +focus down +startup_message off +screen -t progress bash -c "while true; do cat /tmp/upgrade.fifo; sleep .5; done" +focus up diff --git a/abs/extra/screen/PKGBUILD b/abs/extra/screen/PKGBUILD new file mode 100644 index 0000000..c22d539 --- /dev/null +++ b/abs/extra/screen/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 131720 2011-07-14 01:42:52Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Committer: dorphell <dorphell@gmx.net> + +pkgname=screen +pkgver=4.0.3 +pkgrel=12 +_ptygroup=5 #the UID of our PTY/TTY group +pkgdesc="Full-screen window manager that multiplexes a physical terminal" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/screen/" +license=('GPL') +depends=('ncurses' 'pam') +backup=('etc/screenrc' 'etc/pam.d/screen') +options=('!makeflags') +install=screen.install +source=(ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${pkgver}.tar.gz + screen-4.0.3-long-term.patch + screen-4.0.3-caption-colors.patch + screen.pam) +md5sums=('8506fd205028a96c741e4037de6e3c42' + '2723c3e71d5a2e5a74b6ddbc5215ef0f' + '191b6ced695ce2ae3a65bf02c2d4220f' + '74f7919d7b65436cc2ea5341fa8ca374') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i $srcdir/screen-4.0.3-long-term.patch + patch -Np2 -i $srcdir/screen-4.0.3-caption-colors.patch + + ./configure --prefix=/usr --enable-pam \ + --with-sys-screenrc=/etc/screenrc --enable-colors256 \ + --enable-rxvt_osc --enable-telnet \ + --with-pty-group=$_ptygroup \ + --mandir=/usr/share/man --infodir=/usr/share/info + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + install -Dm644 ${srcdir}/screen.pam ${pkgdir}/etc/pam.d/screen + + install -Dm644 etc/completer.zsh ${pkgdir}/usr/share/zsh/site-functions/screen + install -Dm644 etc/etcscreenrc ${pkgdir}/etc/screenrc + install -Dm644 etc/screenrc ${pkgdir}/etc/skel/.screenrc +} diff --git a/abs/extra/screen/screen-4.0.3-caption-colors.patch b/abs/extra/screen/screen-4.0.3-caption-colors.patch new file mode 100644 index 0000000..c92cb0c --- /dev/null +++ b/abs/extra/screen/screen-4.0.3-caption-colors.patch @@ -0,0 +1,21 @@ +From e6a28cf8bfdac15faa6c267bf476ddcaddf48d67 Mon Sep 17 00:00:00 2001 +From: Sadrul Habib Chowdhury <sadrul@users.sourceforge.net> +Date: Tue, 26 Jan 2010 20:17:26 +0000 +Subject: Accommodate more color changes in the caption. + +--- +diff --git a/src/screen.c b/src/screen.c +index b1c3dfb..2cceae0 100644 +--- a/src/screen.c ++++ b/src/screen.c +@@ -2204,7 +2204,7 @@ static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec"; + #endif + + static char winmsg_buf[MAXSTR]; +-#define MAX_WINMSG_REND 16 /* rendition changes */ ++#define MAX_WINMSG_REND 256 /* rendition changes */ + static int winmsg_rend[MAX_WINMSG_REND]; + static int winmsg_rendpos[MAX_WINMSG_REND]; + static int winmsg_numrend; +-- +cgit v0.8.3.4 diff --git a/abs/extra/screen/screen-4.0.3-long-term.patch b/abs/extra/screen/screen-4.0.3-long-term.patch new file mode 100644 index 0000000..3e66acd --- /dev/null +++ b/abs/extra/screen/screen-4.0.3-long-term.patch @@ -0,0 +1,24 @@ +diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h +--- screen-4.0.3-orig//display.h 2003-07-02 00:01:42.000000000 +1000 ++++ screen-4.0.3/display.h 2010-12-03 20:19:23.826671689 +1000 +@@ -85,7 +85,7 @@ + struct win *d_other; /* pointer to other window */ + int d_nonblock; /* -1 don't block if obufmax reached */ + /* >0: block after nonblock secs */ +- char d_termname[20 + 1]; /* $TERM */ ++ char d_termname[40 + 1]; /* $TERM */ + char *d_tentry; /* buffer for tgetstr */ + char d_tcinited; /* termcap inited flag */ + int d_width, d_height; /* width/height of the screen */ +diff -Naur screen-4.0.3-orig//screen.h screen-4.0.3/screen.h +--- screen-4.0.3-orig//screen.h 2003-08-22 22:28:43.000000000 +1000 ++++ screen-4.0.3/screen.h 2010-12-03 20:19:43.163338333 +1000 +@@ -202,7 +202,7 @@ + char preselect[20]; + int esc; /* his new escape character unless -1 */ + int meta_esc; /* his new meta esc character unless -1 */ +- char envterm[20 + 1]; /* terminal type */ ++ char envterm[40 + 1]; /* terminal type */ + int encoding; /* encoding of display */ + } + attach; diff --git a/abs/extra/screen/screen.install b/abs/extra/screen/screen.install new file mode 100644 index 0000000..9340e60 --- /dev/null +++ b/abs/extra/screen/screen.install @@ -0,0 +1,21 @@ +infodir=usr/share/info +filelist=(screen.info screen.info-1 screen.info-2 screen.info-3 screen.info-4 screen.info-5) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + diff --git a/abs/extra/screen/screen.pam b/abs/extra/screen/screen.pam new file mode 100644 index 0000000..07c42ad --- /dev/null +++ b/abs/extra/screen/screen.pam @@ -0,0 +1 @@ +auth required pam_unix.so |