From 661a3a4e39bb2a3f6f43e71d5918e39f5df17ec4 Mon Sep 17 00:00:00 2001 From: rhatto Date: Sat, 23 Sep 2006 15:41:24 +0000 Subject: [PATCH] moved old/ to utils/ and deleted old stuff git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@9 04377dda-e619-0410-9926-eae83683ac58 --- old/lspkg.old | 31 -------- old/mkjail.old | 76 ------------------ old/templatepkg.old | 64 --------------- old/teste | 132 ------------------------------- {old => utils}/merge-template.sh | 0 {old => utils}/searchpkg | 0 6 files changed, 303 deletions(-) delete mode 100755 old/lspkg.old delete mode 100755 old/mkjail.old delete mode 100755 old/templatepkg.old delete mode 100644 old/teste rename {old => utils}/merge-template.sh (100%) rename {old => utils}/searchpkg (100%) diff --git a/old/lspkg.old b/old/lspkg.old deleted file mode 100755 index fe28a65..0000000 --- a/old/lspkg.old +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# -# lspkg -# feedback: rhatto at riseup.net | gpl -# -# todo: -# -# -r, --remove: remove matching packages -# -d, --description: show matching packages' descriptions -# -s, --search: search a file under the matching packages -# -p, --print: print the contents of a package file -# - -function usage { - echo usage: $0 [-v|-d|-s|-p expression] - exit 1 -} - -if [[ "$1" == "-v" ]]; then - if [[ ! -z "$2" ]]; then - less $(ls /var/log/packages/$2*) - else - usage - fi -elif [[ $1 = -p ]]; then - if [ -f $2 ]; then - tar ztvf $2 - fi -else - ls /var/log/packages/$1* -fi diff --git a/old/mkjail.old b/old/mkjail.old deleted file mode 100755 index b6caac5..0000000 --- a/old/mkjail.old +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -# -# mkjail v0.4: chroot jail maker -# feedback: rhatto at riseup.net | GPL -# - -BASE_CONF=/etc/mkjail -CONF=$BASE_CONF/mkjail.conf - -# under the config file, adjust this to where your things live -# PACKAGES="/storage/vserver/slack/" -# DEVICES="/storage/vserver/devices.tar.gz" -# SCRIPTS="/storage/vserver/etc/" -# GPGKEY="/storage/vserver/slack/GPG-KEY" -# SKEL="/storage/vserver/skel.conf" - -if [ -f "$CONF" ]; then - source $CONF -else - echo $0 error: config file $CONFIG not found - exit 1 -elif (($# != 1)); then - echo "usage: $0 [template]" - exit 1 -elif [ -d "/vservers/$1" ]; then - echo $0 error: vserver $1 already exists - exit 1 -fi - -if [[ ! -z "$2" && -f "$BASE_CONF/$2.template"]]; then - TEMPLATE="$BASE_CONF/$2.template" -elif [ -f "$BASE_CONF/default.template" ] - echo template $2 not found, using default template -else - echo $0 error: no templates found - echo please create a template using templatepkg - exit 1 -fi - -server=$1 -mkdir /vservers/$server - -echo "instaling packages..." - -for pack in `cat $TEMPLATE`; do - installpkg --root /vservers/$server `searchpkg -1 $pack` -done - -echo "creating /etc/ and copying init scripts" - -if [ -d "$BASE_CONF/$template" ]; then - rsync -Cav $BASE_CONF/$template/ /vservers/$server/ -fi - -cp /etc/resolv.conf /vservers/$server/etc/ -cp /etc/localtime /vservers/$server/etc/ -echo /dev/hdv1 / ext2 defaults 1 1 > /vservers/$server/etc/fstab -echo /dev/hdv1 / ext2 rw 0 0 > /vservers/$server/etc/mtab - -echo "creating devices and dependencies" -cd /vservers/$server/ -tar zxvf $DEVICES -chroot /vservers/$server/ sbin/ldconfig - -echo "creating /etc/vservers/$server.conf" -cp $SKEL /etc/vservers/$server.conf - -echo "importing slack gpg pubkey" -mkdir /vservers/$server/root/.gnupg -gpg --homedir /vservers/$server/root/.gnupg --import $GPGKEY - -# todo: add rebootmgr -echo "done; now edit /etc/vservers/$server.conf" -echo "then, set iptables rules and start $server vserver" -echo "dont forget to change root's password" - diff --git a/old/templatepkg.old b/old/templatepkg.old deleted file mode 100755 index 51a4fc2..0000000 --- a/old/templatepkg.old +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -# -# templatepkg: create a simplepkg package list from -# a legacy slackware /var/log/packages -# - -# pkgtool stuff -package_name() { - STRING=`basename $1 .tgz` - # Check for old style package name with one segment: - if [ "`echo $STRING | cut -f 1 -d -`" = "`echo $STRING | cut -f 2 -d -`" ]; then - echo $STRING - else # has more than one dash delimited segment - # Count number of segments: - INDEX=1 - while [ ! "`echo $STRING | cut -f $INDEX -d -`" = "" ]; do - INDEX=`expr $INDEX + 1` - done - INDEX=`expr $INDEX - 1` # don't include the null value - # If we don't have four segments, return the old-style (or out of spec) package name: - if [ "$INDEX" = "2" -o "$INDEX" = "3" ]; then - echo $STRING - else # we have four or more segments, so we'll consider this a new-style name: - NAME=`expr $INDEX - 3` - NAME="`echo $STRING | cut -f 1-$NAME -d -`" - echo $NAME - fi - fi -} - -if [[ ! -z "$3" && "$1" == "-o" ]]; then - ROOT="$2" - TEMPLATE="$3" - OPTION="o" -elif [[ ! -z "$2" && "$1" == "-o" ]]; then - ROOT="/" - TEMPLATE=$2 - OPTION="o" -elif [[ ! -z "$2" && "$1" != "-o" ]]; then - ROOT="$1" - TEMPLATE="$2" -elif [ ! -z "$1" ]; then - ROOT="/" - TEMPLATE="$1" -else - echo "usage: [MASK=mask] $0 [-o root-dir] [-a] " - echo -e "\troot-dir is the absolute path from with the desired /var/log/packages is placed" - echo -e "\toptionaly, use MASK=mask $0 ..., eg: MASK=gcc* $0 ..." - exit 1 -fi - -if [ ! -d "$ROOT/var/log/packages" ]; then - echo $ROOT/var/log/packages: directory not found - exit 1 -elif [[ -f "$TEMPLATE" && "$OPTION" != "o" ]]; then - echo template $TEMPLATE already exists: use -o to overwrite - exit 1 -elif [[ -f "$TEMPLATE" && "$OPTION" == "o" ]]; then - rm -f $TEMPLATE -fi - -for package in `ls -1 $ROOT/var/log/packages/$MASK`; do - package_name $package >> $TEMPLATE -done diff --git a/old/teste b/old/teste deleted file mode 100644 index 6f9c64e..0000000 --- a/old/teste +++ /dev/null @@ -1,132 +0,0 @@ -Eterm -anacron -antiword -ardour -audacity -azureus -bitlbee -bogofilter -bootsplash -cadaver -camp -checkinstall -cinelerra -cpan2tgz -cryptsetup-luks -darkice -darksnow -dopewars -dvbackup -dvgrab -e_modules -eclair -ecore -edb -edje -eel -eet -elicit -elinks -emacs -embryo -emotion -enlightenment -entice -entrance -eog -epeg -epsilon -esmart -etox -evas -ewl -extralite -ffmpeg -fglrx64_6_8_0 -firefox -gconf -gdm -gftp -ghex -gnome-icon-theme -gnome-keyring -gnome-mime-data -gnome-vfs -gnumeric -gnupg -gnutls -gphoto2 -gqview -grip -grub -gtk-gnutella -gtkam -hicolor-icon-theme -homecrypt -hydrogen -iconbar -jack -jackmix -jgal -jre -kernel-ratten -kino -ladspa_sdk -latex2html-2002-2 -libart_lgpl -libavc1394 -libbonobo -libbonoboui -libdrm -libdv -libexif-gtk -libgnome -libgnomecanvas -libgnomeprint -libgnomeprintui -libgnomeui -libgphoto2 -libgsasl -libgsf -libidl -libjackasyn -liblrdf -libraw1394 -librsvg -libsidplay -libsndfile -libstdc++5 -libtheora -lm_sensors -mairix -mondo -mp3blaster -mplayer -msmtp -mutt -netpbm -nicotine -offlineimap -orbit2 -puredata-0.39 -pygtk -python -qemu -qiv -qjackctl -raptor -realtime-lsm -rhattofonts -rhattoscripts -scons -shfs -sqlite -stellarium -tcd -torsmo -turboprint -unrtf -urlview -vte -wxGTK -xmms_jack diff --git a/old/merge-template.sh b/utils/merge-template.sh similarity index 100% rename from old/merge-template.sh rename to utils/merge-template.sh diff --git a/old/searchpkg b/utils/searchpkg similarity index 100% rename from old/searchpkg rename to utils/searchpkg -- 2.39.5