diff options
author | Alec Leamas <leamas.alec@gmail.com> | 2010-10-31 15:20:00 +0300 |
---|---|---|
committer | Alec Leamas <leamas.alec@gmail.com> | 2010-10-31 15:20:00 +0300 |
commit | 21772842be0e256ff70afbe96558bf09f98cf90f (patch) | |
tree | 482dfb7c294a18f145a6b403df4f694f07ae794e /pkg | |
parent | 68d2f4162ea0da5160d1664784e9168e85240d57 (diff) |
bugfixes
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/source/dist/.gitkeep | 0 | ||||
-rwxr-xr-x | pkg/ubuntu/diaspora-install | 9 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkg/source/dist/.gitkeep b/pkg/source/dist/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/pkg/source/dist/.gitkeep diff --git a/pkg/ubuntu/diaspora-install b/pkg/ubuntu/diaspora-install index 4679c9f2b..fc4aebbf6 100755 --- a/pkg/ubuntu/diaspora-install +++ b/pkg/ubuntu/diaspora-install @@ -43,12 +43,19 @@ mkdir -p /var/lib/diaspora/tmp mkdir -p /var/run/diaspora mkdir -p /etc/diaspora +bundle='/usr/lib/diaspora-bundle' +[[ $(arch) == 'x86_64']] && bundle='/usr/lib64/diaspora-bundle' + ln -sf /var/log/diaspora ./master/log cp master/config/app_config.yml.example /etc/diaspora/app_config.yml ln -sf /etc/diaspora/app_config.yml master/config/app_config.yml ln -sf /var/lib/diaspora/uploads master/public/ ln -sf /var/lib/diaspora/tmp master -ln -sf /usr/lib/diaspora-bundle/vendor/bundle master/vendor +rm -rf master/vendor +ln -sf $bundle/vendor master/vendor + +ln -sf $bundle/Gemfile master/Gemfile +ln -sf $bundle/Gemfile.lock master/Gemfile.lock rm -rf /usr/share/doc/diaspora mkdir -p /usr/share/doc/diaspora |