diff options
| -rw-r--r-- | README | 260 | ||||
| -rw-r--r-- | conf/repos.conf.new (renamed from repos.conf.new) | 0 | ||||
| -rw-r--r-- | conf/simplepkg.conf.new (renamed from simplepkg.conf.new) | 0 | ||||
| -rw-r--r-- | doc/CHANGELOG (renamed from CHANGELOG) | 3 | ||||
| -rw-r--r-- | doc/COPYING (renamed from COPYING) | 0 | ||||
| -rw-r--r-- | doc/README | 258 | ||||
| -rw-r--r-- | doc/README.pt_BR (renamed from README.pt_BR) | 0 | ||||
| -rw-r--r-- | doc/README.simplaret (renamed from README.simplaret) | 0 | ||||
| -rw-r--r-- | doc/README.simplaret.pt_BR (renamed from README.simplaret.pt_BR) | 0 | ||||
| -rw-r--r-- | doc/TODO (renamed from TODO) | 0 | ||||
| -rw-r--r-- | doinst.sh | 2 | ||||
| -rw-r--r-- | install/doinst.sh | 2 | ||||
| -rw-r--r-- | install/slack-desc (renamed from slack-desc) | 0 | ||||
| -rw-r--r-- | lib/common.sh (renamed from common.sh) | 0 | ||||
| -rwxr-xr-x | simplepkg.SlackBuild | 18 | ||||
| -rw-r--r-- | src/createpkg (renamed from createpkg) | 2 | ||||
| -rwxr-xr-x | src/jail-update (renamed from jail-update) | 0 | ||||
| -rwxr-xr-x | src/jail-upgrade (renamed from jail-upgrade) | 0 | ||||
| -rwxr-xr-x | src/lspkg (renamed from lspkg) | 0 | ||||
| -rwxr-xr-x | src/metapkg (renamed from metapkg) | 0 | ||||
| -rwxr-xr-x | src/mkjail (renamed from mkjail) | 0 | ||||
| -rwxr-xr-x | src/rebuildpkg (renamed from rebuildpkg) | 0 | ||||
| -rwxr-xr-x | src/simplaret (renamed from simplaret) | 0 | ||||
| -rwxr-xr-x | src/templatepkg (renamed from templatepkg) | 0 |
24 files changed, 275 insertions, 270 deletions
@@ -1,258 +1,2 @@ -Simplepkg: installation manager and metapackage system ------------------------------------------------------- - -Author: Silvio Rhatto <rhatto at riseup.net> -Licence: GPL - -Simplepkg is a non-intrusive package management system running on top of pkgtool. -It uses templates -- lists of installed packages, scripts and configuration files --- allowing the creation of installation profiles that can be used do install a -complete and configured slackware system in another partition or to create chroot -environments. The same templating scheme extends slackware packaging system, adding -metapackages: a list of packages installed or removed with a single command. - -Documentation -------------- - - English documentation: README | http://slack.sarava.org/node/15 - Portuguese documentation: REAMDE.pt_BR | http://slack.sarava.org/node/12 - -Description ------------ - -All GNU/Linux distributions comes with a well developed packaging system. The question now -is how pratical is the way to install, configure and control any changes in a system. - -As an example, suppose you should keep a list of about 200 slackware machines, some -of them used as desktops, others as mail or webservers. If you lost some hardrives -or usually need to re-install or update some of those boxes. - -Using the slackware installation cd and configuring by hand all the time you got a crash -is a time loss activity and you'll never know if something remained missconfigured. An -alternative is to keep a complete backup of a machine or some parts of the tree, but for -a large number of different boxes this procedure costs a lots of resources. - -Simplepkg offers an alternative sollution for this and other problems related to installation -management, allowing you to keep templates of each machine and install a custom slackware -system with just one or a few commands. Creating and upgrading chroot and vservers is easy -with simplepkg. - -Architecture ------------- - -Simplepkg is a set of scripts wrote in the KISS philosophy. Its a pretty simple system, composed -by the following commands: - - - mkjail: build a slackware jail/installation in a folder - - metapkg: install or remove a metapackage - - templatepkg: create or update a package list of an installation template - - lspkg: show installed packages and its contents - - jail-upgrade: upgrade all or some of the jails/installations - - jail-update: update all configuration files of a template - - rebuildpkg: rebuild a package based on its /var/log/packages entry - - simplaret: package retrieval tool - - createpkg: donwload, compile and package creationg script based on http://slack.sarava.org/slackbuilds - -Simplepkg configs are placed at /etc/simplepkg. Templates are .template files containing an one-by-line -package list. A template can be something like this: - - aaa_base - aaa_elflibs - apache - bash - bin - coreutils - findutils - -Slackware's tagfile format can be used too as a template. - -Installation ------------- - -The latest version of simplepkg is locate at http://slack.sarava.org/packages/noarch/. -Install it with the usual way: - - installpkg simplepkg-VERSION-noarch-BUILD.tgz - -If you have a working swaret on your system, add this line on you swaret.conf: - - REPOS_ROOT=SlackMidiataticaNoarch%http://slack.sarava.org/packages/noarch - -and then issue those commands: - - swaret --update - swaret --install simplepkg - -Configuration -------------- - -As an example, we'll create a jail based on the packages installed in your slackware -system. Edit the config file /etc/simplepkg/simplepkg.conf: - - # /etc/simplepkg/simplepkg.conf - JAIL_ROOT="/vservers" # where jails are placed - SIMPLARET="simplaret" # package grabber program (can be swaret if you have it installed) - SIMPLARET_CLEAN="1" # clean package cache before installation - SIMPLARET_DELETE_DOWN="1" # clean package cache after the installation - SIMPLARET_UPDATE="0" # issue an simplaret --update before install the jail - SIMPLARET_PURGE_WEEKS="N" # delete packages older than N weeks from the cache - PATCHES_DIR="/storage/package/patches" # where patches are placed - DEFAULT_ARCH="i386" - DEFAULT=VERSION="10.2" - STORAGE="/storage/packages" # where simplepkg store packages - PASSIVE_FTP="1" - -You should also put in /etc/simplepkg/repos.conf all package repositories you use, like this: - - ROOT-i386="http://slack.sarava.org/packages/slackware" - REPOS-i386="slack-sarava%http://slack.sarava.org/packages/slackware/slackware-10.2/" - ROOT-x86_64-10.2="http://darkstar.ist.utl.pt/pub/slamd64/" - REPOS-x86_64-10.2="slamd-sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2/" - -Instead of simplaret you can use swaret to fetch packages and them your swaret.conf must -be configured to use the same place as STORAGE to the package cache. In this case you cant -keep installations and jails with multiple arquitetures and for that reason the use of -simplaret is recommended. - -Creating jails and replicating installations --------------------------------------------- - - templatepkg my-slackare - mkjail jail my-slackware - -The previous commands creates a template called my-slackware from based on your installed -softwares listed in /var/log/packages and then creates a completely new slackware -tree with all those packages in the folder /vservers/jail (depending on the value of JAIL_ROOT from -your simplepkg.conf). - -If you want that some config files get copied or some scripts executed after install this jail, -place in the folder /etc/simplepkg/my-slackware.d all your config files (preserving the file -system hierarchy, i.e, /etc/simplepkg/my-slackware/etc/apache/httpd.conf) and the scripts at -/etc/simplepkg/my-slackware.s/. The template vserver, which comes in the simplepkg package, has -an example script to use with mkjail. - -You can specify an alternative destination for your jail with a command like - - ROOT=/mnt mkjail hda2 my-slackware - -This does exactly what you think: installs slackware in /mnt/hda2 with exactly the same packages -you have on your system, replacing the need of the slackware installer! - -In case no template specified, mkjail uses the one called /etc/simplepkg/default.template. - -If you keep your jails in JAIL_ROOT with the same name as the template you used to create it, its -possible to use the command jail-update to copy all modifications made in the files which their -counterparts are placed at /etc/simplepkg/jail-name.d. Then you can copy all configuration files -you edited to the template folder and leave a crontab entry to everyday seek for changes and update -the template. When you issue the command - - jail-update - -all jails listed in /etc/simplepkg/jaillist are updated. This command also updates the package list -of the template. - -To add or remove packages from a template, you can just edit by hand the template file or use the -command templatepkg with the -a (append) flag, which adds just the new installed packages in the -template file. - -If you want to create a template from a jail, use - - templatepkg jail /vservers/jail - -Metapackages ------------- - -Another use for the templates is the creation of metapackegs: new users have lots of difficulties -to track dependencies when installing a software. Using a template containing the name of all -packages needed by some program allow users to easily install it through the command - - metapkg --install program-name - -This seems like swaret or slapt-get, with the only difference in the way metapkg deals with -dependence resolution. Slapt-get support the slack-required file, wich comes or not with the -package. Swaret has its own tool for dependence matching. - -Simplepkg doesn't wish to substitute those two dependence checking modes, but offer an alternate -way to distribute packages where dependences are resolved without an specific tool or a change -in the package itself. - -A metapackage, i.e, all installed packages from a template, can be removed with - - metapkg --remove program-name - -Upgrading jails ---------------- - -Both the main installation (your root system) and your jails are upgraded with the command -jail-upgrade: just adjust simplepkg.conf's PATCHES_DIR to where you store slackware patches -(that can be rsync'ed everyday) and do a - - jail-upgrade - -This will upgrade your main system and all jails living in JAIL_ROOT. To specify another -folder, use - - ROOT=/otherroot jail-upgrade - -If you want to upgrade just one specific jail, - - jail-upgrade jail-name - -To use a patches folder other than PATCHES_DIR, e.g when you have jails with different -slackware versions, use - - PATCHES=/alternative/patches/folder jail-upgrade jail-name - -Different archs and versions ----------------------------- - -Simplepkg was idealized to permit a template to create jails from any architecture and version -of a slackware-like system. Upgrading tasks also are unified. This feature just works if you -use simplaret and not swaret as the package retrieval tool. - -As another example, to create an slack 10.1 installation (assuming your /etc/simplepkg/repos.conf with -the right configuration), just type - - VERSION=10.1 mkjail my-jail server-template - -Different archs can be used too. If you have a x86_64 system and wants to install a slack 10.2 -in a partition, try something like - - ARCH=i386 VERSION=10.2 ROOT=/mnt mkjail hda2 my-slackware - -Note that the templates are arch and version independent, as they just contain package names, -configuration files and scripts. For this reason, the commands templatepkg, metapkg, lspkg and -jail-update can be used normaly. - -To upgrade jails with othes archs and versions, jail-upgrade checks this information through -/etc/slackware-version for each jail and applies the correspondent patches grabed from -simplaret (see the proper documentation). - -By this way, doesn't matter which versions and archs each of your jails has, jail-upgrade remains -the same since your patches are sorted by arch an version, as explained in simplaret documentation -found at http://slack.sarava.org/node/17. - -Auxiliar applications: rebuildpkg and createpkg ------------------------------------------------ - -Simplepkg comes with an additional helper tool that recover installed packages which the original -.tgz file was lost. The command rebuildpkg rebuilds a package from their entry in /var/log/packages. -As an example, - - rebuildpkg coreutils - -rebuilds the coreutils package using the files, scripts and metainformations stored in -/var/log/packages/ and /var/log/scripts/. - -If you want to build you own packages using the scripts available from http://slack.sarava.org/slackbuilds, -use the createpkg script: - - createpkg package-name - -Source ------- - -Source code for simplepkg and its package builder can be fetched via subversion: - - svn checkout svn://slack.sarava.org/simplepkg - +See doc/README for more information. +Portuguese documentation at doc/README.pt_BR diff --git a/repos.conf.new b/conf/repos.conf.new index 274e1c7..274e1c7 100644 --- a/repos.conf.new +++ b/conf/repos.conf.new diff --git a/simplepkg.conf.new b/conf/simplepkg.conf.new index 2b9e165..2b9e165 100644 --- a/simplepkg.conf.new +++ b/conf/simplepkg.conf.new diff --git a/CHANGELOG b/doc/CHANGELOG index 2de335a..847ec3b 100644 --- a/CHANGELOG +++ b/doc/CHANGELOG @@ -1,7 +1,8 @@ simplepkg changelog ------------------- -0.4.9pre1: added createpkg +0.4.9pre2: re-organized the source repository + added createpkg updated README and README.pt_BR 0.4.8: simplaret: removed extra folder from slamd64 definition diff --git a/doc/README b/doc/README new file mode 100644 index 0000000..50b0e9d --- /dev/null +++ b/doc/README @@ -0,0 +1,258 @@ +Simplepkg: installation manager and metapackage system +------------------------------------------------------ + +Author: Silvio Rhatto <rhatto at riseup.net> +Licence: GPL + +Simplepkg is a non-intrusive package management system running on top of pkgtool. +It uses templates -- lists of installed packages, scripts and configuration files +-- allowing the creation of installation profiles that can be used do install a +complete and configured slackware system in another partition or to create chroot +environments. The same templating scheme extends slackware packaging system, adding +metapackages: a list of packages installed or removed with a single command. + +Documentation +------------- + + English documentation: README | http://slack.sarava.org/node/15 + Portuguese documentation: REAMDE.pt_BR | http://slack.sarava.org/node/12 + +Description +----------- + +All GNU/Linux distributions comes with a well developed packaging system. The question now +is how pratical is the way to install, configure and control any changes in a system. + +As an example, suppose you should keep a list of about 200 slackware machines, some +of them used as desktops, others as mail or webservers. If you lost some hardrives +or usually need to re-install or update some of those boxes. + +Using the slackware installation cd and configuring by hand all the time you got a crash +is a time loss activity and you'll never know if something remained missconfigured. An +alternative is to keep a complete backup of a machine or some parts of the tree, but for +a large number of different boxes this procedure costs a lots of resources. + +Simplepkg offers an alternative sollution for this and other problems related to installation +management, allowing you to keep templates of each machine and install a custom slackware +system with just one or a few commands. Creating and upgrading chroot and vservers is easy +with simplepkg. + +Architecture +------------ + +Simplepkg is a set of scripts wrote in the KISS philosophy. Its a pretty simple system, composed +by the following commands: + + - mkjail: build a slackware jail/installation in a folder + - metapkg: install or remove a metapackage + - templatepkg: create or update a package list of an installation template + - lspkg: show installed packages and its contents + - jail-upgrade: upgrade all or some of the jails/installations + - jail-update: update all configuration files of a template + - rebuildpkg: rebuild a package based on its /var/log/packages entry + - simplaret: package retrieval tool + - createpkg: donwload, compile and package creationg script based on http://slack.sarava.org/slackbuilds + +Simplepkg configs are placed at /etc/simplepkg. Templates are .template files containing an one-by-line +package list. A template can be something like this: + + aaa_base + aaa_elflibs + apache + bash + bin + coreutils + findutils + +Slackware's tagfile format can be used too as a template. + +Installation +------------ + +The latest version of simplepkg is locate at http://slack.sarava.org/packages/noarch/. +Install it with the usual way: + + installpkg simplepkg-VERSION-noarch-BUILD.tgz + +If you have a working swaret on your system, add this line on you swaret.conf: + + REPOS_ROOT=SlackMidiataticaNoarch%http://slack.sarava.org/packages/noarch + +and then issue those commands: + + swaret --update + swaret --install simplepkg + +Configuration +------------- + +As an example, we'll create a jail based on the packages installed in your slackware +system. Edit the config file /etc/simplepkg/simplepkg.conf: + + # /etc/simplepkg/simplepkg.conf + JAIL_ROOT="/vservers" # where jails are placed + SIMPLARET="simplaret" # package grabber program (can be swaret if you have it installed) + SIMPLARET_CLEAN="1" # clean package cache before installation + SIMPLARET_DELETE_DOWN="1" # clean package cache after the installation + SIMPLARET_UPDATE="0" # issue an simplaret --update before install the jail + SIMPLARET_PURGE_WEEKS="N" # delete packages older than N weeks from the cache + PATCHES_DIR="/storage/package/patches" # where patches are placed + DEFAULT_ARCH="i386" + DEFAULT=VERSION="10.2" + STORAGE="/storage/packages" # where simplepkg store packages + PASSIVE_FTP="1" + +You should also put in /etc/simplepkg/repos.conf all package repositories you use, like this: + + ROOT-i386="http://slack.sarava.org/packages/slackware" + REPOS-i386="slack-sarava%http://slack.sarava.org/packages/slackware/slackware-10.2/" + ROOT-x86_64-10.2="http://darkstar.ist.utl.pt/pub/slamd64/" + REPOS-x86_64-10.2="slamd-sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2/" + +Instead of simplaret you can use swaret to fetch packages and them your swaret.conf must +be configured to use the same place as STORAGE to the package cache. In this case you cant +keep installations and jails with multiple arquitetures and for that reason the use of +simplaret is recommended. + +Creating jails and replicating installations +-------------------------------------------- + + templatepkg my-slackare + mkjail jail my-slackware + +The previous commands creates a template called my-slackware from based on your installed +softwares listed in /var/log/packages and then creates a completely new slackware +tree with all those packages in the folder /vservers/jail (depending on the value of JAIL_ROOT from +your simplepkg.conf). + +If you want that some config files get copied or some scripts executed after install this jail, +place in the folder /etc/simplepkg/my-slackware.d all your config files (preserving the file +system hierarchy, i.e, /etc/simplepkg/my-slackware/etc/apache/httpd.conf) and the scripts at +/etc/simplepkg/my-slackware.s/. The template vserver, which comes in the simplepkg package, has +an example script to use with mkjail. + +You can specify an alternative destination for your jail with a command like + + ROOT=/mnt mkjail hda2 my-slackware + +This does exactly what you think: installs slackware in /mnt/hda2 with exactly the same packages +you have on your system, replacing the need of the slackware installer! + +In case no template specified, mkjail uses the one called /etc/simplepkg/default.template. + +If you keep your jails in JAIL_ROOT with the same name as the template you used to create it, its +possible to use the command jail-update to copy all modifications made in the files which their +counterparts are placed at /etc/simplepkg/jail-name.d. Then you can copy all configuration files +you edited to the template folder and leave a crontab entry to everyday seek for changes and update +the template. When you issue the command + + jail-update + +all jails listed in /etc/simplepkg/jaillist are updated. This command also updates the package list +of the template. + +To add or remove packages from a template, you can just edit by hand the template file or use the +command templatepkg with the -a (append) flag, which adds just the new installed packages in the +template file. + +If you want to create a template from a jail, use + + templatepkg jail /vservers/jail + +Metapackages +------------ + +Another use for the templates is the creation of metapackegs: new users have lots of difficulties +to track dependencies when installing a software. Using a template containing the name of all +packages needed by some program allow users to easily install it through the command + + metapkg --install program-name + +This seems like swaret or slapt-get, with the only difference in the way metapkg deals with +dependence resolution. Slapt-get support the slack-required file, wich comes or not with the +package. Swaret has its own tool for dependence matching. + +Simplepkg doesn't wish to substitute those two dependence checking modes, but offer an alternate +way to distribute packages where dependences are resolved without an specific tool or a change +in the package itself. + +A metapackage, i.e, all installed packages from a template, can be removed with + + metapkg --remove program-name + +Upgrading jails +--------------- + +Both the main installation (your root system) and your jails are upgraded with the command +jail-upgrade: just adjust simplepkg.conf's PATCHES_DIR to where you store slackware patches +(that can be rsync'ed everyday) and do a + + jail-upgrade + +This will upgrade your main system and all jails living in JAIL_ROOT. To specify another +folder, use + + ROOT=/otherroot jail-upgrade + +If you want to upgrade just one specific jail, + + jail-upgrade jail-name + +To use a patches folder other than PATCHES_DIR, e.g when you have jails with different +slackware versions, use + + PATCHES=/alternative/patches/folder jail-upgrade jail-name + +Different archs and versions +---------------------------- + +Simplepkg was idealized to permit a template to create jails from any architecture and version +of a slackware-like system. Upgrading tasks also are unified. This feature just works if you +use simplaret and not swaret as the package retrieval tool. + +As another example, to create an slack 10.1 installation (assuming your /etc/simplepkg/repos.conf with +the right configuration), just type + + VERSION=10.1 mkjail my-jail server-template + +Different archs can be used too. If you have a x86_64 system and wants to install a slack 10.2 +in a partition, try something like + + ARCH=i386 VERSION=10.2 ROOT=/mnt mkjail hda2 my-slackware + +Note that the templates are arch and version independent, as they just contain package names, +configuration files and scripts. For this reason, the commands templatepkg, metapkg, lspkg and +jail-update can be used normaly. + +To upgrade jails with othes archs and versions, jail-upgrade checks this information through +/etc/slackware-version for each jail and applies the correspondent patches grabed from +simplaret (see the proper documentation). + +By this way, doesn't matter which versions and archs each of your jails has, jail-upgrade remains +the same since your patches are sorted by arch an version, as explained in simplaret documentation +found at http://slack.sarava.org/node/17. + +Auxiliar applications: rebuildpkg and createpkg +----------------------------------------------- + +Simplepkg comes with an additional helper tool that recover installed packages which the original +.tgz file was lost. The command rebuildpkg rebuilds a package from their entry in /var/log/packages. +As an example, + + rebuildpkg coreutils + +rebuilds the coreutils package using the files, scripts and metainformations stored in +/var/log/packages/ and /var/log/scripts/. + +If you want to build you own packages using the scripts available from http://slack.sarava.org/slackbuilds, +use the createpkg script: + + createpkg package-name + +Source +------ + +Source code for simplepkg and its package builder can be fetched via subversion: + + svn checkout svn://slack.sarava.org/simplepkg + diff --git a/README.pt_BR b/doc/README.pt_BR index 4e814de..4e814de 100644 --- a/README.pt_BR +++ b/doc/README.pt_BR diff --git a/README.simplaret b/doc/README.simplaret index ce7efbd..ce7efbd 100644 --- a/README.simplaret +++ b/doc/README.simplaret diff --git a/README.simplaret.pt_BR b/doc/README.simplaret.pt_BR index 164294b..164294b 100644 --- a/README.simplaret.pt_BR +++ b/doc/README.simplaret.pt_BR diff --git a/doinst.sh b/doinst.sh deleted file mode 100644 index d8bcadf..0000000 --- a/doinst.sh +++ /dev/null @@ -1,2 +0,0 @@ -( echo please edit /etc/simplepkg/simplepkg.conf.new and /etc/simplepkg/repos.conf.new ) -( echo and rename them to /etc/simplepkg/simplepkg.conf and /etc/simplepkg/repos.conf ) diff --git a/install/doinst.sh b/install/doinst.sh new file mode 100644 index 0000000..f205158 --- /dev/null +++ b/install/doinst.sh @@ -0,0 +1,2 @@ +( if [ ! -f "/etc/simplepkg/simplepkg.conf" ]; then mv /etc/simplepkg.conf.new /etc/simplepkg/simplepkg.conf; fi ) +( if [ ! -f "/etc/simplepkg/repos.conf" ]; then mv /etc/simplepkg/repos.conf.new /etc/simplepkg/repos.conf; fi ) diff --git a/slack-desc b/install/slack-desc index c0f52f4..c0f52f4 100644 --- a/slack-desc +++ b/install/slack-desc diff --git a/common.sh b/lib/common.sh index af31da3..af31da3 100644 --- a/common.sh +++ b/lib/common.sh diff --git a/simplepkg.SlackBuild b/simplepkg.SlackBuild index 26a2d5a..7f435b2 100755 --- a/simplepkg.SlackBuild +++ b/simplepkg.SlackBuild @@ -6,7 +6,7 @@ PACKAGE="simplepkg" PACK_DIR="package-$PACKAGE" BUILD="1rha" -VERSION="0.4.9pre1" +VERSION="0.4.9pre2" ARCH="noarch" LIBEXEC="/usr/libexec/$PACKAGE" @@ -18,24 +18,24 @@ DOC_LIST="COPYING TODO CHANGELOG README README.pt_BR README.simplaret README.sim rm -rf $PACK_DIR mkdir -p $PACK_DIR/install -cp slack-desc $PACK_DIR/install -cp doinst.sh $PACK_DIR/install +cp install/slack-desc $PACK_DIR/install +cp install/doinst.sh $PACK_DIR/install mkdir -p $PACK_DIR/$BINDIR for binary in $BINARY_LIST; do - chmod +x $binary - cp $binary $PACK_DIR/$BINDIR + cp src/$binary $PACK_DIR/$BINDIR + chmod +x $PACK_DIR/$BINDIR/$binary done mkdir -p $PACK_DIR/$LIBEXEC for lib in $LIB_LIST; do - cp $lib $PACK_DIR/$LIBEXEC/ + cp lib/$lib $PACK_DIR/$LIBEXEC/ done rm -rf $PACK_DIR/$DOC_DIR mkdir -p $PACK_DIR/$DOC_DIR/$PACKAGE-$VERSION for file in $DOC_LIST; do - cp $file $PACK_DIR/$DOC_DIR/$PACKAGE-$VERSION/ + cp doc/$file $PACK_DIR/$DOC_DIR/$PACKAGE-$VERSION/ done # especifico do simplepkg @@ -43,8 +43,8 @@ mkdir -p $PACK_DIR/etc/$PACKAGE/ rsync -av --exclude=.svn templates/* $PACK_DIR/etc/$PACKAGE/ chmod +x $PACK_DIR/etc/$PACKAGE/vserver.s/*.sh chmod +x $PACK_DIR/etc/$PACKAGE/vserver-legacy.s/*.sh -cp simplepkg.conf.new $PACK_DIR/etc/$PACKAGE -cp repos.conf.new $PACK_DIR/etc/$PACKAGE +cp conf/simplepkg.conf.new $PACK_DIR/etc/$PACKAGE +cp conf/repos.conf.new $PACK_DIR/etc/$PACKAGE cd $PACK_DIR/usr/sbin && ln -s jail-upgrade vserver-upgrade cd - diff --git a/createpkg b/src/createpkg index 0faa82d..45fb329 100644 --- a/createpkg +++ b/src/createpkg @@ -95,6 +95,8 @@ function solve_dep { if [ "$found" != "1" ]; then createpkg --install $pack + else + found="0" fi } diff --git a/jail-update b/src/jail-update index f6635b5..f6635b5 100755 --- a/jail-update +++ b/src/jail-update diff --git a/jail-upgrade b/src/jail-upgrade index b9567fd..b9567fd 100755 --- a/jail-upgrade +++ b/src/jail-upgrade diff --git a/rebuildpkg b/src/rebuildpkg index 43c76cd..43c76cd 100755 --- a/rebuildpkg +++ b/src/rebuildpkg diff --git a/simplaret b/src/simplaret index ed98402..ed98402 100755 --- a/simplaret +++ b/src/simplaret diff --git a/templatepkg b/src/templatepkg index 9c1f8bc..9c1f8bc 100755 --- a/templatepkg +++ b/src/templatepkg |