finally and testedly done

2 files changed, 12 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be9d64eeaa4d..893553cb03e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Dec 10 23:30:50 UTC 2015
+# Thu Dec 10 23:45:21 UTC 2015
 pkgbase = nion-swift
 	pkgdesc = Program developed by Nion Co. for interfacing with electron microscopes and for data analysis.
 	pkgver = 0.5.7
diff --git a/PKGBUILD b/PKGBUILD
index 447fecbcc96c..11ce3a1a0f7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,18 +23,21 @@ md5sums=("SKIP")
 # }
 
 package() {
-    cd "$srcdir/NionSwift_python3.4m_0.5.7"
-    echo "`ls`"
-    mkdir -p $pkgdir/usr/local
-    cp -R NionSwift $pkgdir/usr/local/
-    echo "startdir $startdir"
-    echo "pkgdir $pkgdir"
-    echo "`ls $startdir`"
+    # cd "$srcdir/NionSwift_python3.4m_0.5.7"
+    # echo "`ls`"
+    mkdir -p $pkgdir/usr/local/
+    cp -Rax $srcdir/NionSwift_python3.4m_0.5.7/ $pkgdir/usr/local/
+    mv $pkgdir/usr/local/NionSwift_python3.4m_0.5.7/ $pkgdir/usr/local/NionSwift
+    # cp -R NionSwift $pkgdir/usr/local/
+    # echo "startdir $startdir"
+    # echo "pkgdir $pkgdir"
+    # echo "`ls $startdir`"
 
     mkdir -p $pkgdir/usr/share/{applications,pixmaps}
     install -Dm644 $startdir/nionswift.desktop $pkgdir/usr/share/applications/
     install -Dm644 $startdir/nionswift.png $pkgdir/usr/share/pixmaps/
 
     mkdir -p $pkgdir/usr/bin
-    ln -s $pkgdir/usr/local/NionSwift $pkgdir/usr/bin/NionSwift
+    ln -s $pkgdir/usr/local/NionSwift/NionSwift $pkgdir/usr/bin/NionSwift
+    chmod +x $pkgdir/usr/local/NionSwift/NionSwift
 }