-
Notifications
You must be signed in to change notification settings - Fork 273
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
make all DISTRO_PET_REPOS files readable and easily editable
this way it's easier to fix issues related to the pet repos of course some issues will be fixed just by looking at these files and identifying what's wrong..
- Loading branch information
Showing
14 changed files
with
767 additions
and
378 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,54 @@ | ||
| #PKG_DOCS_PET_REPOS | ||
| #where to download the pet pkgs databases from. | ||
| #first field is for testing the url. | ||
| #second field is full URI of the database file. | ||
| #third field is name of db file when local and after being processed into standard format | ||
| # (in the case of PET databases, the names are the same and no processing is required) | ||
| #110607 i was putting many "common" pet pkgs in the 'quirky' repo, now using 'common'. | ||
| #110608 simplify pet pkg search order. | ||
| #111124 add arm architecture repo. | ||
| #111126 Packages-puppy-noarch-official now has all no-architecture PETs, supplanting -common-. | ||
| #121102 file DISTRO_SPECS has new variable DISTRO_DB_SUBNAME (visible in this file), replaces DISTRO_COMPAT_VERSION below. for 14.0-based slacko, DISTRO_DB_SUBNAME=slacko14 | ||
| #130111 name ARCHDIR possible clash, use xTARGETARCH. | ||
|
|
||
| xTARGETARCH="" | ||
| if [ "$DISTRO_TARGETARCH" != "x86" ];then #defined in /etc/DISTRO_SPECS | ||
| xTARGETARCH="${DISTRO_TARGETARCH}" #ex: arm | ||
| fi | ||
|
|
||
| #PET_REPOS | ||
| #hardcode the pet repos in here... | ||
| #first field is for testing the url. | ||
| #second field is full URI of the repo | ||
| #third field is the name of db-file(s) associated with that repo. it may have glob wildcards. | ||
| # ex: Packages-puppy-4-official (note, url paths are in the database) | ||
|
|
||
| if [ "$xTARGETARCH" = "" ];then | ||
| PKG_DOCS_PET_REPOS="ibiblio.org|http://distro.ibiblio.org//puppylinux/Packages-puppy-${DISTRO_DB_SUBNAME}-official|Packages-puppy-${DISTRO_DB_SUBNAME}-official ibiblio.org|http://distro.ibiblio.org//puppylinux/Packages-puppy-wary5-official|Packages-puppy-wary5-official ibiblio.org|http://distro.ibiblio.org//puppylinux/Packages-puppy-common-official|Packages-puppy-common-official ibiblio.org|http://distro.ibiblio.org//puppylinux/Packages-puppy-5-official|Packages-puppy-5-official ibiblio.org|http://distro.ibiblio.org//puppylinux/Packages-puppy-4-official|Packages-puppy-4-official ibiblio.org|http://distro.ibiblio.org//puppylinux/Packages-puppy-3-official|Packages-puppy-3-official ibiblio.org|http://distro.ibiblio.org//puppylinux/Packages-puppy-2-official|Packages-puppy-2-official ibiblio.org|http://distro.ibiblio.org//puppylinux/Packages-puppy-noarch-official|Packages-puppy-noarch-official" | ||
| PET_REPOS='ibiblio.org|http://distro.ibiblio.org//puppylinux|Packages-puppy-*-official ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux|Packages-puppy-*-official uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux|Packages-puppy-*-official mirror.aarnet.edu.au|ftp://mirror.aarnet.edu.au/pub/puppylinux|Packages-puppy-*-official ibiblio.org|http://distro.ibiblio.org//puppylinux|Packages-puppy-*-official ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux|Packages-puppy-*-official ftp.vcu.edu|ftp://ftp.vcu.edu/pub/gnu+linux/puppylinux|Packages-puppy-*-official uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux|Packages-puppy-*-official mirror.aarnet.edu.au|http://mirror.aarnet.edu.au/pub/puppylinux|Packages-puppy-*-official mirror.internode.on.net|http://mirror.internode.on.net/pub/puppylinux|Packages-puppy-*-official' | ||
| else | ||
| PKG_DOCS_PET_REPOS="ibiblio.org|http://distro.ibiblio.org/puppylinux/${xTARGETARCH}/Packages-puppy-${DISTRO_DB_SUBNAME}-official|Packages-puppy-${DISTRO_DB_SUBNAME}-official ibiblio.org|http://distro.ibiblio.org/puppylinux/Packages-puppy-noarch-official|Packages-puppy-noarch-official" | ||
| PET_REPOS="ibiblio.org|http://distro.ibiblio.org/puppylinux/${xTARGETARCH}|Packages-puppy-${DISTRO_DB_SUBNAME}-official ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux/${xTARGETARCH}|Packages-puppy-${DISTRO_DB_SUBNAME}-official uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux/${xTARGETARCH}|Packages-puppy-${DISTRO_DB_SUBNAME}-official ibiblio.org|http://distro.ibiblio.org/puppylinux|Packages-puppy-noarch-official ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux|Packages-puppy-noarch-official uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux|Packages-puppy-noarch-official" | ||
| fi | ||
| #------------------ | ||
| #PKG_DOCS_PET_REPOS - where to download the pet pkgs databases from. | ||
| #------------------ | ||
| # 1|2|3 | ||
| # 1 - domain. for testing the url. | ||
| # 2 - full URI of the database file. | ||
| # 3 - name of db file when local and after being processed into standard format | ||
| # (in the case of PET databases, the names are the same and no processing is required) | ||
|
|
||
| PKG_DOCS_PET_REPOS=" | ||
| ibiblio.org|http://distro.ibiblio.org/puppylinux/Packages-puppy-${DISTRO_DB_SUBNAME}-official|Packages-puppy-${DISTRO_DB_SUBNAME}-official | ||
| " | ||
|
|
||
| #--------- | ||
| #PET_REPOS - hardcode the pet repos in here... | ||
| #--------- | ||
| # 1|2|3 | ||
| # 1 - domain. for testing the url. | ||
| # 2 - full URI of the repo | ||
| # 3 - name of db-file(s) associated with that repo. it may have glob wildcards. | ||
| # ex: Packages-puppy-4-official (note, url paths are in the database) | ||
|
|
||
| PET_REPOS=' | ||
| ibiblio.org|http://distro.ibiblio.org/puppylinux|Packages-puppy-*-official | ||
| ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux|Packages-puppy-*-official | ||
| uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux|Packages-puppy-*-official | ||
| mirror.aarnet.edu.au|ftp://mirror.aarnet.edu.au/pub/puppylinux|Packages-puppy-*-official | ||
| ibiblio.org|http://distro.ibiblio.org/puppylinux|Packages-puppy-*-official | ||
| ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux|Packages-puppy-*-official | ||
| ftp.vcu.edu|ftp://ftp.vcu.edu/pub/gnu+linux/puppylinux|Packages-puppy-*-official | ||
| uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux|Packages-puppy-*-official | ||
| mirror.aarnet.edu.au|http://mirror.aarnet.edu.au/pub/puppylinux|Packages-puppy-*-official | ||
| mirror.internode.on.net|http://mirror.internode.on.net/pub/puppylinux|Packages-puppy-*-official | ||
| ' | ||
|
|
||
| #---------------------- | ||
| #PACKAGELISTS_PET_ORDER | ||
| #this defines where Woof looks first and second (and third, etc.) for pet pkgs | ||
|
|
||
| if [ "$xTARGETARCH" = "" ];then #x86. | ||
| PACKAGELISTS_PET_ORDER="Packages-puppy-noarch-official Packages-puppy-common-official Packages-puppy-wary5-official Packages-puppy-4-official" | ||
| #110722 fiddling with this again... | ||
| case $DISTRO_BINARY_COMPAT in #in file DISTRO_SPECS | ||
| ubuntu) | ||
| #110622 have to leave Packages-puppy-5-official in for ubuntu... | ||
| PACKAGELISTS_PET_ORDER="Packages-puppy-5-official Packages-puppy-noarch-official Packages-puppy-common-official Packages-puppy-4-official" | ||
| [ -f Packages-puppy-${DISTRO_DB_SUBNAME}-official ] && PACKAGELISTS_PET_ORDER="Packages-puppy-${DISTRO_DB_SUBNAME}-official ${PACKAGELISTS_PET_ORDER}" | ||
| ;; | ||
| slackware) #110816 slacko | ||
| PACKAGELISTS_PET_ORDER='Packages-puppy-slacko-official Packages-puppy-noarch-official Packages-puppy-common-official Packages-puppy-wary5-official Packages-puppy-4-official' | ||
| ;; | ||
| *) | ||
| [ -f Packages-puppy-${DISTRO_DB_SUBNAME}-official ] && PACKAGELISTS_PET_ORDER="Packages-puppy-${DISTRO_DB_SUBNAME}-official Packages-puppy-noarch-official Packages-puppy-common-official Packages-puppy-wary5-official Packages-puppy-4-official" | ||
| ;; | ||
| esac | ||
| else | ||
| #arm arch. etc... | ||
| PACKAGELISTS_PET_ORDER="Packages-puppy-${DISTRO_DB_SUBNAME}-official Packages-puppy-noarch-official" | ||
| fi | ||
| #---------------------- | ||
| # this defines where Woof (and PPM) looks first and second | ||
| # (and third, etc.) for pet pkgs | ||
|
|
||
| PACKAGELISTS_PET_ORDER=" | ||
| Packages-puppy-${DISTRO_DB_SUBNAME}-official | ||
| Packages-puppy-noarch-official | ||
| " | ||
|
|
||
|
|
||
| #--------------- | ||
| # fix variables | ||
| #--------------- | ||
| PKG_DOCS_PET_REPOS=$(echo "$PKG_DOCS_PET_REPOS" | sed '/^$/d' | tr '\n' ' ' | sed 's% $%%') | ||
| PET_REPOS=$(echo "$PET_REPOS" | sed '/^$/d' | tr '\n' ' ' | sed 's% $%%') | ||
| PACKAGELISTS_PET_ORDER=$(echo "$PACKAGELISTS_PET_ORDER" | sed '/^$/d' | tr '\n' ' ' | sed 's% $%%') | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,56 @@ | ||
| #PKG_DOCS_PET_REPOS | ||
| #where to download the pet pkgs databases from. | ||
| #first field is for testing the url. | ||
| #second field is full URI of the database file. | ||
| #third field is name of db file when local and after being processed into standard format | ||
| # (in the case of PET databases, the names are the same and no processing is required) | ||
| #------------------ | ||
| #PKG_DOCS_PET_REPOS - where to download the pet pkgs databases from. | ||
| #------------------ | ||
| # 1|2|3 | ||
| # 1 - domain. for testing the url. | ||
| # 2 - full URI of the database file. | ||
| # 3 - name of db file when local and after being processed into standard format | ||
| # (in the case of PET databases, the names are the same and no processing is required) | ||
|
|
||
| #PET_REPOS | ||
| #hardcode the pet repos in here... | ||
| #first field is for testing the url. | ||
| #second field is full URI of the repo | ||
| #third field is the name of db-file(s) associated with that repo. it may have glob wildcards. | ||
| # ex: Packages-puppy-4-official (note, url paths are in the database) | ||
| PKG_DOCS_PET_REPOS=" | ||
| ibiblio.org|http://distro.ibiblio.org/puppylinux/arm/Packages-puppy-${DISTRO_COMPAT_VERSION}-official|Packages-puppy-${DISTRO_COMPAT_VERSION}-official | ||
| ibiblio.org|http://distro.ibiblio.org/puppylinux/Packages-puppy-noarch-official|Packages-puppy-noarch-official | ||
| ibiblio.org|http://distro.ibiblio.org/puppylinux/arm/Packages-puppy-armv6-official|Packages-puppy-armv6-official | ||
| " | ||
|
|
||
| ARCHDIR='arm' #note, this is in variable DISTRO_TARGETARCH in /etc/DISTRO_SPECS | ||
| #DISTRO_COMPAT_VERSION specified in /etc/DISTRO_SPECS (=wheezy) | ||
| #--------- | ||
| #PET_REPOS - hardcode the pet repos in here... | ||
| #--------- | ||
| # 1|2|3 | ||
| # 1 - domain. for testing the url. | ||
| # 2 - full URI of the repo | ||
| # 3 - name of db-file(s) associated with that repo. it may have glob wildcards. | ||
| # ex: Packages-puppy-4-official (note, url paths are in the database) | ||
|
|
||
| PKG_DOCS_PET_REPOS="ibiblio.org|http://distro.ibiblio.org/puppylinux/${ARCHDIR}/Packages-puppy-${DISTRO_COMPAT_VERSION}-official|Packages-puppy-${DISTRO_COMPAT_VERSION}-official ibiblio.org|http://distro.ibiblio.org/puppylinux/Packages-puppy-noarch-official|Packages-puppy-noarch-official ibiblio.org|http://distro.ibiblio.org/puppylinux/${ARCHDIR}/Packages-puppy-armv6-official|Packages-puppy-armv6-official" | ||
|
|
||
| PET_REPOS="ibiblio.org|http://distro.ibiblio.org/puppylinux/${ARCHDIR}|Packages-puppy-${DISTRO_COMPAT_VERSION}-official ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux/${ARCHDIR}|Packages-puppy-${DISTRO_COMPAT_VERSION}-official uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux/${ARCHDIR}|Packages-puppy-${DISTRO_COMPAT_VERSION}-official ibiblio.org|http://distro.ibiblio.org/puppylinux|Packages-puppy-noarch-official ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux|Packages-puppy-noarch-official uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux|Packages-puppy-noarch-official ibiblio.org|http://distro.ibiblio.org/puppylinux/${ARCHDIR}|Packages-puppy-armv6-official ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux/${ARCHDIR}|Packages-puppy-armv6-official uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux/${ARCHDIR}|Packages-puppy-armv6-official" | ||
| PET_REPOS=" | ||
| ibiblio.org|http://distro.ibiblio.org/puppylinux/arm|Packages-puppy-${DISTRO_COMPAT_VERSION}-official | ||
| ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux/arm|Packages-puppy-${DISTRO_COMPAT_VERSION}-official | ||
| uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux/arm|Packages-puppy-${DISTRO_COMPAT_VERSION}-official | ||
| ibiblio.org|http://distro.ibiblio.org/puppylinux|Packages-puppy-noarch-official | ||
| ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux|Packages-puppy-noarch-official | ||
| uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux|Packages-puppy-noarch-official | ||
| ibiblio.org|http://distro.ibiblio.org/puppylinux/arm|Packages-puppy-armv6-official | ||
| ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux/arm|Packages-puppy-armv6-official | ||
| uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux/arm|Packages-puppy-armv6-official | ||
| " | ||
|
|
||
| #---------------------- | ||
| #PACKAGELISTS_PET_ORDER | ||
| #this defines where Woof looks first and second (and third, etc.) for pet pkgs | ||
| #---------------------- | ||
| # this defines where Woof (and PPM) looks first and second | ||
| # (and third, etc.) for pet pkgs | ||
|
|
||
| PACKAGELISTS_PET_ORDER=" | ||
| Packages-puppy-${DISTRO_COMPAT_VERSION}-official | ||
| Packages-puppy-noarch-official | ||
| Packages-puppy-armv6-official | ||
| " | ||
|
|
||
|
|
||
| #--------------- | ||
| # fix variables | ||
| #--------------- | ||
| PKG_DOCS_PET_REPOS=$(echo "$PKG_DOCS_PET_REPOS" | sed '/^$/d' | tr '\n' ' ' | sed 's% $%%') | ||
| PET_REPOS=$(echo "$PET_REPOS" | sed '/^$/d' | tr '\n' ' ' | sed 's% $%%') | ||
| PACKAGELISTS_PET_ORDER=$(echo "$PACKAGELISTS_PET_ORDER" | sed '/^$/d' | tr '\n' ' ' | sed 's% $%%') | ||
|
|
||
| PACKAGELISTS_PET_ORDER="Packages-puppy-${DISTRO_COMPAT_VERSION}-official Packages-puppy-noarch-official Packages-puppy-armv6-official" |
Oops, something went wrong.