updated wine to version 1.3.14

This commit is contained in:
Giuseppe 2011-02-24 15:22:21 +00:00
parent efc5110da0
commit 552145af87
3 changed files with 200 additions and 141 deletions

View File

@ -17,15 +17,21 @@
_script_name="check files" _script_name="check files"
_cur_repo=$(pwd | awk -F '/' '{print $NF}') _cur_repo=$(pwd | awk -F '/' '{print $NF}')
_needed_functions="config_handling helpers messages"
_build_arch="$_arch" _build_arch="$_arch"
_sarch="x32"
[[ ${_arch} = *x*64* ]] && _sarch="x64"
source _buildscripts/functions/config_handling # helper functions
source _buildscripts/functions/helpers for subroutine in ${_needed_functions} ; do
source _buildscripts/functions/messages source _buildscripts/functions/${subroutine}
done
# Determine the sync folder # Determine the sync folder
if [[ ${_cur_repo} = *-testing ]] && [[ ${_cur_repo} != lib32-testing ]] ; then if [[ ${_cur_repo} = *-testing ]] && [[ ${_cur_repo} != lib32-testing ]] ; then
_sync_folder="_testing/" _sync_folder="_testing-${_sarch}/"
elif [[ ${_cur_repo} = *-unstable ]] ; then
_sync_folder="_unstable-${_sarch}/"
else else
_sync_folder="_repo/remote/" _sync_folder="_repo/remote/"
fi fi
@ -39,16 +45,14 @@ load_configs
check_rsync check_rsync
check_accounts check_accounts
question() {
echo -e -n "\033[1;32m::\033[1;0m\033[1;0m $1\033[1;0m"
}
sync_down() sync_down()
{ {
msg "syncing down" msg "syncing down"
export RSYNC_PASSWORD=$(echo ${_rsync_pass}) export RSYNC_PASSWORD=$(echo ${_rsync_pass})
if [ "${_sync_folder}" == "_testing/" ] ; then if [ "${_sync_folder}" = "_testing-${_sarch}/" ] ; then
rsync -avh --progress ${_rsync_user}@${_rsync_server}::dev/testing/$_build_arch/* ${_sync_folder} rsync -avh --progress ${_rsync_user}@${_rsync_server}::dev/testing/$_build_arch/* ${_sync_folder}
elif [ "${_sync_folder}" = "_unstable-${_sarch}/" ] ; then
rsync -avh --progress ${_rsync_user}@${_rsync_server}::dev/unstable/$_build_arch/* ${_sync_folder}
else else
rsync -avh --progress ${_rsync_user}@${_rsync_server}::${_rsync_dir}/* ${_sync_folder} rsync -avh --progress ${_rsync_user}@${_rsync_server}::${_rsync_dir}/* ${_sync_folder}
fi fi
@ -67,14 +71,16 @@ sync_down
# Get the file list in the server # Get the file list in the server
export RSYNC_PASSWORD=$(echo ${_rsync_pass}) export RSYNC_PASSWORD=$(echo ${_rsync_pass})
if [ "${_sync_folder}" == "_testing/" ] ; then if [ "${_sync_folder}" = "_testing-${_sarch}/" ] ; then
repo_files=`rsync -avh --list-only ${_rsync_user}@${_rsync_server}::dev/testing/$_arch/* | cut -d ":" -f 3 | cut -d " " -f 2` repo_files=$(rsync -avh --list-only ${_rsync_user}@${_rsync_server}::dev/testing/$_arch/* | awk -F ' ' '{print $NF}')
elif [ "${_sync_folder}" = "_unstable-${_sarch}/" ] ; then
repo_files=$(rsync -avh --list-only ${_rsync_user}@${_rsync_server}::dev/unstable/$_arch/* | awk -F ' ' '{print $NF}')
else else
repo_files=`rsync -avh --list-only ${_rsync_user}@${_rsync_server}::${_rsync_dir}/* | cut -d ":" -f 3 | cut -d " " -f 2` repo_files=$(rsync -avh --list-only ${_rsync_user}@${_rsync_server}::${_rsync_dir}/* | awk -F ' ' '{print $NF}')
fi fi
# Get the file list in sync folder # Get the file list in the sync folder
local_files=`ls -a ${_sync_folder}* | cut -d "/" -f 3` local_files=$(ls -a ${_sync_folder}* | awk -F '/' '{print $NF}')
# Get the list of files to remove # Get the list of files to remove
remove_list="" remove_list=""
@ -85,35 +91,31 @@ for _file in ${local_files} ; do
file_exist="true" file_exist="true"
fi fi
done done
if [ "${file_exist}" = "false" ] ; then if [ "${file_exist}" = "false" ] ; then
remove_list="${remove_list} ${_file}" remove_list="${remove_list} ${_file}"
fi fi
done done
if [ "${remove_list}" != "" ] ; then if [ "${remove_list}" != "" ] ; then
msg "The following packages in _repo/remote don't exist in the sever:" msg "The following packages in ${_sync_folder} don't exist in the sever:"
newline newline
echo "${remove_list}" echo "${remove_list}"
newline newline
question "Do you want to remove the package(s)? (y/n) " question "Do you want to remove the package(s)? (y/n) "
while true ; do while true ; do
read yn read yn
case ${yn} in case ${yn} in
[yY]* ) [yY]* )
newline ; newline ;
remove_packages ; remove_packages ;
break ; break ;
;; ;;
[nN]* ) [nN]* )
newline ; newline ;
title "The files will be keeped..." ; title "The files will be keeped..." ;
newline ; newline ;
break ; break ;
;; ;;
* ) * )
echo "Enter (y)es or (n)o" ; echo "Enter (y)es or (n)o" ;
;; ;;

103
rmpkg.sh
View File

@ -19,24 +19,28 @@
# global vars # global vars
# #
_script_name="Remove Package(s)" _script_name="Remove Package(s)"
_cur_repo=`pwd | awk -F '/' '{print $NF}'` _cur_repo=$(pwd | awk -F '/' '{print $NF}')
_needed_functions="config_handling helpers messages" _needed_functions="config_handling helpers messages"
_args=`echo $1`
_build_arch="$_arch" _build_arch="$_arch"
_sarch="x32"
_args=`echo $1`
[[ ${_arch} = *x*64* ]] && _sarch="x64"
# helper functions # helper functions
for subroutine in ${_needed_functions} ; do for subroutine in ${_needed_functions} ; do
source _buildscripts/functions/${subroutine} source _buildscripts/functions/${subroutine}
done done
# Determine the sync folder # Determine the sync folder
if [[ ${_cur_repo} = *-testing ]] && [[ ${_cur_repo} != lib32-testing ]] ; then if [[ ${_cur_repo} = *-testing ]] && [[ ${_cur_repo} != lib32-testing ]] ; then
_sync_folder="_testing/" _sync_folder="_testing-${_sarch}/"
elif [[ ${_cur_repo} = *-unstable ]] ; then
_sync_folder="_unstable-${_sarch}/"
else else
_sync_folder="_repo/remote/" _sync_folder="_repo/remote/"
fi fi
# #
# main # main
# #
@ -45,13 +49,71 @@ sync_down()
{ {
msg "syncing down" msg "syncing down"
export RSYNC_PASSWORD=$(echo ${_rsync_pass}) export RSYNC_PASSWORD=$(echo ${_rsync_pass})
if [ "${_sync_folder}" == "_testing/" ] ; then if [ "${_sync_folder}" = "_testing-${_sarch}/" ] ; then
rsync -avh --progress ${_rsync_user}@${_rsync_server}::dev/testing/$_build_arch/* ${_sync_folder} rsync -avh --progress ${_rsync_user}@${_rsync_server}::dev/testing/$_build_arch/* ${_sync_folder}
elif [ "${_sync_folder}" = "_unstable-${_sarch}/" ] ; then
rsync -avh --progress ${_rsync_user}@${_rsync_server}::dev/unstable/$_build_arch/* ${_sync_folder}
else else
rsync -avh --progress ${_rsync_user}@${_rsync_server}::${_rsync_dir}/* ${_sync_folder} rsync -avh --progress ${_rsync_user}@${_rsync_server}::${_rsync_dir}/* ${_sync_folder}
fi fi
} }
check_files()
{
# Get the file list in the server
export RSYNC_PASSWORD=$(echo ${_rsync_pass})
if [ "${_sync_folder}" = "_testing-${_sarch}/" ] ; then
repo_files=$(rsync -avh --list-only ${_rsync_user}@${_rsync_server}::dev/testing/$_arch/* | awk -F ' ' '{print $NF}')
elif [ "${_sync_folder}" = "_unstable-${_sarch}/" ] ; then
repo_files=$(rsync -avh --list-only ${_rsync_user}@${_rsync_server}::dev/unstable/$_arch/* | awk -F ' ' '{print $NF}')
else
repo_files=$(rsync -avh --list-only ${_rsync_user}@${_rsync_server}::${_rsync_dir}/* | awk -F ' ' '{print $NF}')
fi
# Get the file list in the sync folder
local_files=$(ls -a ${_sync_folder}* | awk -F '/' '{print $NF}')
remove_list=""
for parse_file in ${local_files} ; do
file_exist="false"
for compare_file in ${repo_files} ; do
if [ "${parse_file}" = "${compare_file}" ] ; then
file_exist="true"
fi
done
if [ "${file_exist}" = "false" ] ; then
remove_list="${remove_list} ${parse_file}"
fi
done
if [ "$remove_list" != "" ] ; then
msg "The following packages in ${_sync_folder} don't exist in the sever:"
newline
echo "${remove_list}"
newline
question "Do you want to remove the package(s)? (y/n)"
while true ; do
read yn
case ${yn} in
[yY]* )
newline ;
remove_packages;
break
;;
[nN]* )
newline ;
title "The files will be keeped..." ;
newline ;
break
;;
* )
echo "Enter (y)es or (n)o"
;;
esac
done
fi
}
remove_packages() remove_packages()
{ {
# remove the package(s) from sync folder # remove the package(s) from sync folder
@ -66,18 +128,22 @@ sync_up()
# create new pacman database # create new pacman database
msg "creating pacman database" msg "creating pacman database"
rm -rf ${_sync_folder}*.db.tar.* rm -rf ${_sync_folder}*.db.tar.*
pushd ${_sync_folder} pushd ${_sync_folder} &>/dev/null
if [ "${_sync_folder}" == "_testing/" ] ; then if [ "${_sync_folder}" = "_testing-${_sarch}/" ] ; then
repo-add testing.db.tar.gz *.pkg.* repo-add testing.db.tar.gz *.pkg.*
elif [ "${_sync_folder}" = "_unstable-${_sarch}/" ] ; then
repo-add unstable.db.tar.gz *.pkg.*
else else
repo-add ${_cur_repo}.db.tar.gz *.pkg.* repo-add ${_cur_repo}.db.tar.gz *.pkg.*
fi fi
popd popd &>/dev/null
# sync local -> server, removing the packages # sync local -> server, removing the packages
msg "sync local -> server" msg "sync local -> server"
if [ "${_sync_folder}" == "_testing/" ] ; then if [ "${_sync_folder}" = "_testing-${_sarch}/" ] ; then
rsync -avh --progress --delay-updates --delete-after ${_sync_folder} ${_rsync_user}@${_rsync_server}::dev/testing/$_arch/ rsync -avh --progress --delay-updates --delete-after ${_sync_folder} ${_rsync_user}@${_rsync_server}::dev/testing/$_arch/
elif [ "${_sync_folder}" = "_unstable-${_sarch}/" ] ; then
rsync -avh --progress --delay-updates --delete-after ${_sync_folder} ${_rsync_user}@${_rsync_server}::dev/unstable/$_arch/
else else
rsync -avh --progress --delay-updates --delete-after ${_sync_folder} ${_rsync_user}@${_rsync_server}::${_rsync_dir} rsync -avh --progress --delay-updates --delete-after ${_sync_folder} ${_rsync_user}@${_rsync_server}::${_rsync_dir}
fi fi
@ -89,18 +155,6 @@ sync_up()
# #
clear clear
msg "_script_name=$_script_name"
msg "_build_arch=$_build_arch"
msg "_cur_repo=$_cur_repo"
msg "_sync_folder=$_sync_folder"
msg "_sync_user=$_sync_user"
msg "_sync_server=$_sync_server"
msg "_sync_dir=$_sync_dir"
msg "_cur_repo=$_cur_repo"
msg "_arch=$_arch"
msg "_pkgz_to_remove=$_pkgz_to_remove"
title "${_script_name} - $_cur_repo-$_build_arch" title "${_script_name} - $_cur_repo-$_build_arch"
if [ "${_args}" = "" ] ; then if [ "${_args}" = "" ] ; then
@ -119,10 +173,14 @@ check_accounts
# First get the actual packages from the repo # First get the actual packages from the repo
sync_down sync_down
# Check if there's any outdated file
msg "Searching removed files"
check_files
# Generate the list of packages to remove # Generate the list of packages to remove
newline newline
_args=${_args}* _args=${_args}*
_pkgz_to_remove=`ls ${_sync_folder}/${_args} | cut -d/ -f3` _pkgz_to_remove=$(ls ${_sync_folder}${_args} | awk -F '/' '{print $NF}')
if [ "${_pkgz_to_remove}" = "" ] ; then if [ "${_pkgz_to_remove}" = "" ] ; then
exit exit
@ -137,7 +195,6 @@ question "Do you really want to remove the package(s)? (y/n)"
while true ; do while true ; do
read yn read yn
case $yn in case $yn in
[yY]* ) [yY]* )
newline ; newline ;

View File

@ -4,13 +4,13 @@
# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org> # maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
pkgname=wine pkgname=wine
pkgver=1.3.13 pkgver=1.3.14
pkgrel=1 pkgrel=1
_pkgbasever=${pkgver/rc/-rc} _pkgbasever=${pkgver/rc/-rc}
source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
md5sums=('e6d4cd7e51678f90760e2193893637aa') md5sums=('c99c8f518d3b2a13a739dfbd6c417e80')
pkgdesc="A compatibility layer for running Windows programs" pkgdesc="A compatibility layer for running Windows programs"
url="http://www.winehq.com" url="http://www.winehq.com"