Changeset 29699

Timestamp:

2015-01-29T11:58:33+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Changed uri config to include path as well as domain

Location:

main/trunk/package-kits/linux/repos

Files:

• apt (modified) (1 diff)
• conf.sh (modified) (1 diff)
• pacman (modified) (1 diff)
• rpm (modified) (1 diff)

main/trunk/package-kits/linux/repos/apt

@@ -46 +46 @@
 $setup_cmd_instruction
 
-  echo 'deb http://$domain/repos/apt $codename main' > /etc/apt/sources.list.d/greenstone.list
-  curl -L 'http://$domain/repos/gpg.key' | apt-key add -
+  echo 'deb http://$uri_root/apt $codename main' > /etc/apt/sources.list.d/greenstone.list
+  curl -L 'http://$uri_root/gpg.key' | apt-key add -
   apt-get update
 

main/trunk/package-kits/linux/repos/conf.sh

@@ -2 +2 @@
 label="greenstone"
 codename="greenstone"
-domain="greenstone.org"
+uri_root='greenstone.org/repo'
 arch="i386 amd64 source"
-description="Apt repository for Greenstone packages"
+description="Repository for Greenstone packages"
 base=$(dirname $0)
 repos=$base/repos

main/trunk/package-kits/linux/repos/pacman

@@ -32 +32 @@
   (
   echo '[$label]'
-  echo 'Server = http://$domain/repos/arch/\$arch'
+  echo 'Server = http://$uri_root/arch/\$arch'
   ) >> /etc/pacman.conf
-  curl -L 'http://$domain/repos/gpg.key' | pacman-key -a -
+  curl -L 'http://$uri_root/gpg.key' | pacman-key -a -
   pacman-key -f $keyid
   pacman-key --lsign-key $keyid

main/trunk/package-kits/linux/repos/rpm

@@ -35 +35 @@
   echo '[$label]'
   echo 'name=$origin'
-  echo 'baseurl=http://$domain/repos/rpm/\$basearch'
+  echo 'baseurl=http://$uri_root/rpm/\$basearch'
   echo 'enabled=1'
   echo 'gpgcheck=1'
-  echo 'gpgkey=http://$domain/repos/gpg.key'
+  echo 'gpgkey=http://$uri_root/gpg.key'
   ) > /etc/yum.repos.d/greenstone.repo
   yum makecache