* remove historic $prefix /games PATH and support

git-svn-id: https://svn.exactcode.de/t2/trunk@65518 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
This commit is contained in:
René Rebe 2023-10-30 09:52:41 +00:00
parent e4fe84f65c
commit 022402896f
6 changed files with 20 additions and 33 deletions

View File

@ -1,23 +1,20 @@
#!/bin/bash
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: misc/config/config-games.in
# Copyright (C) 2004 - 2005 The T2 SDE Project
# Copyright (C) 2004 - 2023 The T2 SDE Project
# Copyright (C) 1998 - 2003 ROCK Linux Project
#
# More information can be found in the files COPYING and README.
# This Copyright note is generated by scripts/Create-CopyPatch,
# more information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# it under the terms of the GNU General Public License version 2.
# --- T2-COPYRIGHT-NOTE-END ---
menu_begin MENU_PKG_GAMES_GENERAL 'Games Options'
comment '- General settings'
block_begin 4
text 'Games bindir' SDECFG_PKG_GAMES_BINDIR 'usr/games' "
text 'Games bindir' SDECFG_PKG_GAMES_BINDIR 'usr/bin' "
This is where all game binarys or startup scripts should go to."
text 'Games datadir' SDECFG_PKG_GAMES_DATADIR 'usr/share' "
This is where the games should install their datafiles."

View File

@ -48,7 +48,6 @@ m sys
m tmp
m usr
m usr/bin
m usr/games
m usr/include
m usr/lib
m usr/local

View File

@ -1,6 +1,6 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# T2 SDE: package/*/sysfiles/etc_profile.txt
# Copyright (C) 2004 - 2022 The T2 SDE Project
# Copyright (C) 2004 - 2023 The T2 SDE Project
# Copyright (C) 1998 - 2003 ROCK Linux Project
#
# This Copyright note is generated by scripts/Create-CopyPatch,
@ -14,15 +14,13 @@
if [ -w / -o $UID = 0 ]; then
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
for x in /usr/X11/bin /usr/X11/sbin /usr/games /usr/local/games \
/opt/*/bin /opt/*/sbin /opt/*/games $HOME/bin $HOME/sbin
for x in /usr/X11/bin /usr/X11/sbin /opt/*/bin /opt/*/sbin $HOME/bin $HOME/sbin
do
[ -d $x ] && export PATH="$x:$PATH"
done
else
PATH="/usr/local/bin:/usr/bin:/bin"
for x in /usr/X11/bin /usr/games /usr/local/games \
/opt/*/bin /opt/*/games $HOME/bin
for x in /usr/X11/bin /opt/*/bin $HOME/bin
do
[ -d $x ] && export PATH="$x:$PATH"
done

View File

@ -1,18 +1,15 @@
#!/bin/sh
#
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../t2-debug/test_bindups.sh
# Copyright (C) 2004 - 2005 The T2 SDE Project
# T2 SDE: package/*/t2-debug/test_bindups.sh
# Copyright (C) 2004 - 2023 The T2 SDE Project
# Copyright (C) 1998 - 2003 ROCK Linux Project
#
# More information can be found in the files COPYING and README.
# This Copyright note is generated by scripts/Create-CopyPatch,
# more information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# it under the terms of the GNU General Public License version 2.
# --- T2-COPYRIGHT-NOTE-END ---
#
# List all binary names which are used more than once in various bin dirs.
@ -21,7 +18,7 @@
# Bin-Name <Tab> Dir1 <Tab> Dir2
# ...
find {,/usr,/usr/local}/{,s}bin /usr/games -type f -printf '%f %H\n' |
find {,/usr,/usr/local}/{,s}bin -type f -printf '%f %H\n' |
sort | awk 'BEGIN { OFS="\t"; last=""; lastdir=""; }
$1==last { print $1, lastdir, $2; } { lastdir=$2; last=$1; }'

View File

@ -1,6 +1,6 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# T2 SDE: package/*/rubix/rubix.conf
# Copyright (C) 2004 - 2021 The T2 SDE Project
# Copyright (C) 2004 - 2023 The T2 SDE Project
# Copyright (C) 1998 - 2003 ROCK Linux Project
#
# This Copyright note is generated by scripts/Create-CopyPatch,
@ -13,7 +13,6 @@
rubix_pre_fix() {
sed -i -e 's%/usr/games%/usr/bin%' Makefile
sed -i -e 's%/usr/X11R6%/usr/X11R7%' Makefile
# 150101 fix for amd64:
if [[ $libdir == *lib64 ]]; then
sed -i -e 's%L/usr/X11R7/lib %L/usr/X11R7/lib64 %' Makefile
fi

View File

@ -1,15 +1,12 @@
[COPY] --- T2-COPYRIGHT-NOTE-BEGIN ---
[COPY] This copyright note is auto-generated by scripts/Create-CopyPatch.
[COPY]
[COPY] T2 SDE: package/*/cowsay/cowsay.desc
[COPY] Copyright (C) 2004 - 2021 The T2 SDE Project
[COPY] Copyright (C) 2004 - 2023 The T2 SDE Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
[COPY] This Copyright note is generated by scripts/Create-CopyPatch,
[COPY] more information can be found in the files COPYING and README.
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
[COPY] the Free Software Foundation; version 2 of the License. A copy of the
[COPY] GNU General Public License can be found in the file COPYING.
[COPY] it under the terms of the GNU General Public License version 2.
[COPY] --- T2-COPYRIGHT-NOTE-END ---
[I] A program to make speaking and thinking cow quotes
@ -37,5 +34,5 @@
[O] makeopt=
[O] makeinstopt=
[O] hook_add postmake 5 "sh install.sh $root/usr/games/cowsay"
[O] hook_add postmake 5 "sh install.sh $root$bindir/cowsay"
[D] 70d3bbfb36b98fa4dd543620562fd79dee5c9b6c78fd85427c4a724c cowsay-3.04.tar.gz https://github.com/tnalpgge/rank-amateur-cowsay/archive/