fixed permissions

2 files changed, 11 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5d7b3398361a..34e1608339ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,10 +31,15 @@ install="$pkgname".install
 
 package() {
   msg "Converting debian package..."
+  
   cd "$srcdir"
   tar zxpf data.tar.gz -C "$pkgdir"
-  install -dm755 "$pkgdir/usr/bin"
-  install -Dm 644 "rstudio-server.service" "${pkgdir}/etc/systemd/system/rstudio-server.service"
-  install -d "${pkgdir}/etc/rstudio"
+  chmod 755 $(find $pkgdir/usr -type d)
+
+  install -m755 -d "$pkgdir/usr/bin"
+  install -m755 -d "${pkgdir}/etc/rstudio"
+  install -m644 -D "rstudio-server.service" "${pkgdir}/etc/systemd/system/rstudio-server.service"
+  
+  
 }
 # vim:ft=sh tabstop=2 expandtab
diff --git a/rstudio-server-bin.install b/rstudio-server-bin.install
index 6ab040a7fa90..4c246bb4592a 100644
--- a/rstudio-server-bin.install
+++ b/rstudio-server-bin.install
@@ -1,7 +1,7 @@
 post_install() {
   getent group "rstudio" &>/dev/null || groupadd -r rstudio 1>/dev/null
-  getent passwd "rstudio" &>/dev/null || useradd -r -g rstudio -d "/srv/rstudio" -s "/bin/sh" rstudio 1>/dev/null
-  chown rstudio:rstudio /srv/rstudio
+  getent passwd "rstudio" &>/dev/null || useradd -r -g rstudio -d "/usr/lib/rstudio-server/www/" -s "/bin/sh" rstudio 1>/dev/null
+  chown rstudio:rstudio /usr/lib/rstudio-server/www/
   
   ln -s /usr/lib/rstudio-server/bin/rserver /usr/bin/rserver
   ln -s /usr/lib/rstudio-server/bin/rstudio-server /usr/sbin/rstudio-server
@@ -21,6 +21,7 @@ post_remove() {
   fi
 
   rm -f /usr/sbin/rstudio-server
+  rm -f /usr/bin/rserver
   
   rm -rf /var/run/rstudio-server
   rm -rf /var/lock/rstudio-server