Updated source to use https, style changes

2 files changed, 9 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ce80af21ae5..5d3ba9f52655 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ pkgbase = libnjb
 	pkgdesc = Library for communicating with various portable MP3 players
 	pkgver = 2.2.7
 	pkgrel = 3
-	url = http://libnjb.sourceforge.net/
+	url = https://libnjb.sourceforge.net/
 	arch = i686
 	arch = x86_64
 	license = BSD
@@ -10,7 +10,7 @@ pkgbase = libnjb
 	depends = libusb-compat
 	depends = ncurses
 	depends = zlib
-	source = http://downloads.sourceforge.net/sourceforge/libnjb/libnjb-2.2.7.tar.gz
+	source = https://downloads.sourceforge.net/sourceforge/libnjb/libnjb-2.2.7.tar.gz
 	source = 45-libnjb.rules
 	md5sums = 73f25f3297abe316dd0abec921781d50
 	md5sums = 17b83c2469e083bf1f273174d91dfa13
diff --git a/PKGBUILD b/PKGBUILD
index 7f069a49fdfb..654b2e53174c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,24 +7,24 @@ pkgver=2.2.7
 pkgrel=3
 pkgdesc="Library for communicating with various portable MP3 players"
 arch=('i686' 'x86_64')
-url="http://libnjb.sourceforge.net/"
+url="https://libnjb.sourceforge.net/"
 license=('BSD')
 depends=('libusb-compat' 'ncurses' 'zlib')
 makedepends=('doxygen')
-source=(http://downloads.sourceforge.net/sourceforge/libnjb/$pkgname-$pkgver.tar.gz
+source=(https://downloads.sourceforge.net/sourceforge/libnjb/${pkgname}-${pkgver}.tar.gz
         45-libnjb.rules)
 md5sums=('73f25f3297abe316dd0abec921781d50' 
          '17b83c2469e083bf1f273174d91dfa13')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-hotplugging
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D -m644 "$srcdir/45-libnjb.rules" "$pkgdir/usr/lib/udev/rules.d/45-libnjb.rules"
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/45-libnjb.rules" "${pkgdir}/usr/lib/udev/rules.d/45-libnjb.rules"
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }