[arch-commits] Commit in webmin/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Thursday, February 7, 2013 @ 06:55:42
  Author: eric
Revision: 177554

Remove $startdir, Change build function to package one

Modified:
  webmin/trunk/PKGBUILD

----------+
 PKGBUILD |   48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-07 05:50:05 UTC (rev 177553)
+++ PKGBUILD	2013-02-07 05:55:42 UTC (rev 177554)
@@ -90,9 +90,9 @@
 	webmin.service) 
 options=(!strip)
 
-build() {
+package() {
   # NOTE: USE --asroot build option to avoid fakeroot error!
-  cd $startdir/src/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
   # add patches from webmin.com
   #for i in ../*.wbm 
   #do tar xvf $i
@@ -131,12 +131,12 @@
   (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
   
   # create dirs
-  mkdir -p $startdir/pkg/opt/webmin
-  mkdir -p $startdir/pkg/var/log/webmin
-  mkdir -p $startdir/pkg/etc/webmin
+  mkdir -p "$pkgdir"/opt/webmin
+  mkdir -p "$pkgdir"/var/log/webmin
+  mkdir -p "$pkgdir"/etc/webmin
   
   # install pam stuff
-  install -D -m 644 webmin-pam $startdir/pkg/etc/pam.d/webmin
+  install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin
   
   # remove other distros and add only Archlinux don't change next line else it will not work!
   rm os_list.txt
@@ -151,7 +151,7 @@
   sed -i -e 's:^noconfig=0:noconfig=1:g'  defaultacl
 
   # Add pacman menu
-  cd $startdir/src/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
   cp -rf custom/ pacman
   cp -rf mscstyle3/custom mscstyle3/pacman
   sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl
@@ -162,14 +162,14 @@
   sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/*
 
   # copy stuff to right dirs
-  cd $startdir/src/$pkgname-$pkgver
-  cp -rp * $startdir/pkg/opt/webmin
-  cd $startdir/src/webmin-config
-  cp -rfp * $startdir/pkg/opt/webmin
+  cd "$srcdir"/$pkgname-$pkgver
+  cp -rp * "$pkgdir"/opt/webmin
+  cd "$srcdir"/webmin-config
+  cp -rfp * "$pkgdir"/opt/webmin
 
   # define parameters for setup.sh
-  config_dir=$startdir/pkg/etc/webmin
-  var_dir=$startdir/pkg/var/log/webmin
+  config_dir="$pkgdir"/etc/webmin
+  var_dir="$pkgdir"/var/log/webmin
   perl=/usr/bin/perl
   autoos=1
   port=10000
@@ -183,36 +183,36 @@
   nouninstall=1
   noperlpath=1
   atbootyn=n
-  tempdir=$startdir/pkg/tmp
+  tempdir="$pkgdir"/tmp
   export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn
   
   # Fix setup.sh
-  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' $startdir/pkg/opt/webmin/setup.sh
-  $startdir/pkg/opt/webmin/setup.sh
+  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh
+  "$pkgdir"/opt/webmin/setup.sh
   
   # Fixup the config files to use their real locations
-  sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' $startdir/pkg/etc/webmin/miniserv.conf
-  find $startdir/pkg/etc/webmin -type f -exec sed -i "s:$startdir/pkg::g" {} \; 
+  sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf
+  find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; 
   
   # make it only accessible by localhost
-  echo 'allow=127.0.0.1' >> $startdir/pkg/etc/webmin/miniserv.conf
+  echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf
   
   # install pacman menu
-  cd $startdir/src/webmin-pacman/config
-  cp -rfp * $startdir/pkg/etc/webmin/pacman
+  cd "$srcdir"/webmin-pacman/config
+  cp -rfp * "$pkgdir"/etc/webmin/pacman
 
   #install rc file
-  install -D -m 755 $startdir/src/webmin.rc $startdir/pkg/etc/rc.d/webmin
+  install -D -m 755 "$srcdir"/webmin.rc "$pkgdir"/etc/rc.d/webmin
 
   # install systemd files
   install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service
 
   # delete temp dir
-  rm -r $startdir/pkg/tmp
+  rm -r "$pkgdir"/tmp
   # change sticky bit
   chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux
   # install license
-  install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
+  install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
 }
 md5sums=('e5f51402c09558ee688efea3d03a3d83'
          'b0b3e3fb231a12e60165b6b4d604dcfa'