removing rm command

3 files changed, 5 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a4f7c596841..ba2d61cc5de9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Mar 24 21:02:37 UTC 2016
+# Thu Mar 24 23:45:44 UTC 2016
 pkgbase = actor-messenger-bin
 	pkgdesc = Actor Messenger
 	pkgver = 0.9.4
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71e0b6e4ff4d..5af12e77b9a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
 job_makepkg:
   stage: build
   script:
-    - makepkg -srf
+    - makepkg -srf --noconfirm --noprogressbar
   tags:
     - shell
     - arch
diff --git a/PKGBUILD b/PKGBUILD
index 13e47a5001bd..e81ccde71ca9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -63,13 +63,12 @@ md5sums_x86_64=('8b08dc3b85ae39e81309fe1fad6108e6')
 package() {
     install -dm755 "$pkgdir/usr/share/applications/"
     install -dm755 "$pkgdir/usr/bin/"
-    install -dm755 "$pkgdir/opt/"
+    install -dm755 "$pkgdir/opt/actor"
     install -Dm755 "$srcdir/actor-messenger.desktop" "$pkgdir/usr/share/applications/"
 if [[ "$CARCH" == "i686" ]]; then
-    mv "$srcdir/Actor-linux-ia32" "$srcdir/actor-messenger"
+    cp -ru "$srcdir/Actor-linux-ia32/*" "$pkgdir/opt/actor/"
 elif [[ "$CARCH" == "x86_64" ]]; then
-    mv "$srcdir/Actor-linux-x64" "$srcdir/actor-messenger"
+    cp -ru "$srcdir/Actor-linux-x64/*" "$pkgdir/opt/actor/"
 fi
-    cp -r "$srcdir/actor-messenger" "$pkgdir/opt"
     ln -s "/opt/actor-messenger/Actor" "${pkgdir}/usr/bin/actor"
 }