From 01d23e269a3376584ff0f07077a700659ecc09ed Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Tue, 14 Mar 2017 14:03:27 -0500 Subject: [PATCH] #5: Remove unnecessary symlink that caused PHP class definition errors. --- .sandstorm/launcher.sh | 4 ++++ .sandstorm/sandstorm-files.list | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh index 9bab50f..02e6392 100644 --- a/.sandstorm/launcher.sh +++ b/.sandstorm/launcher.sh @@ -26,19 +26,23 @@ if [ ! -e /var/lib/dokuwiki/conf/local.php ]; then rsync -a /opt/app/dokuwiki/conf.orig/ /var/lib/dokuwiki/conf cp /opt/app/local.php /var/lib/dokuwiki/conf fi +rm -f /var/lib/dokuwiki/conf/conf if [ ! -e /var/lib/dokuwiki/data ]; then echo Adding data. rsync -a /opt/app/dokuwiki/data.orig/ /var/lib/dokuwiki/data fi +rm -f /var/lib/dokuwiki/data/data rsync -a /opt/app/dokuwiki/lib/plugins.orig/ /var/lib/dokuwiki/lib/plugins +rm -f /var/lib/dokuwiki/lib/plugins/plugins rsync -a /opt/app/plugin/ /var/lib/dokuwiki/lib/plugins/sandstorm if [ ! -e /var/lib/dokuwiki/lib/tpl ]; then echo Adding templates. rsync -a /opt/app/dokuwiki/lib/tpl.orig/ /var/lib/dokuwiki/lib/tpl fi +rm -f /var/lib/dokuwiki/lib/tpl/tpl cd /var/lib/dokuwiki grep -Ev '^($|#)' /opt/app/dokuwiki/data.orig/deleted.files | xargs -n 1 rm -vrf diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index 8dc4b4f..5ed573b 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -16,9 +16,20 @@ bin/sh bin/sleep bin/touch etc/bash.bashrc +etc/bash_completion.d +etc/bash_completion.d/debconf +etc/bash_completion.d/dkms +etc/bash_completion.d/git-prompt +etc/bash_completion.d/grub +etc/bash_completion.d/initramfs-tools +etc/bash_completion.d/insserv +etc/bash_completion.d/pygmentize +etc/bash_completion.d/whiptail etc/group +etc/init.d etc/inputrc etc/ld.so.cache +etc/locale.alias etc/localtime etc/magic etc/nginx/conf.d @@ -43,8 +54,12 @@ etc/php5/mods-available/leveldb.ini etc/php5/mods-available/opcache.ini etc/php5/mods-available/pdo.ini etc/php5/mods-available/readline.ini +etc/profile +etc/profile.d +etc/profile.d/bash_completion.sh etc/ssl/openssl.cnf lib/terminfo/d/dumb +lib/terminfo/x/xterm-256color lib/x86_64-linux-gnu/ld-2.19.so lib/x86_64-linux-gnu/libacl.so.1 lib/x86_64-linux-gnu/libacl.so.1.1.0 @@ -119,6 +134,7 @@ opt/app/.sandstorm/launcher.sh opt/app/.sandstorm/service-config/fastcgi_params opt/app/.sandstorm/service-config/mime.types opt/app/.sandstorm/service-config/nginx.conf +opt/app/acl.auth.php opt/app/dokuwiki opt/app/dokuwiki/.editorconfig opt/app/dokuwiki/.git @@ -4929,8 +4945,14 @@ opt/app/dokuwiki/lib/tpl.orig/dokuwiki/images/toc-arrows.png opt/app/dokuwiki/lib/tpl.orig/dokuwiki/images/toc-bullet.png opt/app/dokuwiki/lib/tpl.orig/dokuwiki/images/usertools.png opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/bg +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/bg/lang.php opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/cs opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/cs/lang.php +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/cs/style.txt +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/cy +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/cy/lang.php +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/cy/style.txt opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/de opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/de/lang.php opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/de/style.txt @@ -4940,14 +4962,21 @@ opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/en/style.txt opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/es opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/es/lang.php opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/es/style.txt +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/fa +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/fa/lang.php +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/fa/style.txt opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/fr opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/fr/lang.php opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/fr/style.txt +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/hr +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/hr/lang.php +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/hr/style.txt opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/hu opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/hu/lang.php opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/hu/style.txt opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/it opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/it/lang.php +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/it/style.txt opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/ja opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/ja/lang.php opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/ja/style.txt @@ -4962,6 +4991,9 @@ opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/pt-br/lang.php opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/pt-br/style.txt opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/ru opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/ru/lang.php +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/ru/style.txt +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/sk +opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/sk/lang.php opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/zh opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/zh/lang.php opt/app/dokuwiki/lib/tpl.orig/dokuwiki/lang/zh/style.txt @@ -5252,13 +5284,17 @@ sandstorm-http-bridge sandstorm-http-bridge-config sandstorm-manifest usr/bin/file +usr/bin/id usr/bin/rsync usr/bin/touch +usr/bin/whoami usr/bin/xargs +usr/lib/git-core/git-sh-prompt usr/lib/libqdbm.so.14 usr/lib/libqdbm.so.14.14.0 usr/lib/libsnappy.so.1 usr/lib/libsnappy.so.1.2.1 +usr/lib/locale/locale-archive usr/lib/php5/20131226/curl.so usr/lib/php5/20131226/json.so usr/lib/php5/20131226/leveldb.so @@ -5348,9 +5384,12 @@ usr/lib/x86_64-linux-gnu/libxml2.so.2 usr/lib/x86_64-linux-gnu/libxml2.so.2.9.1 usr/lib/x86_64-linux-gnu/libxslt.so.1 usr/lib/x86_64-linux-gnu/libxslt.so.1.1.28 +usr/sbin/grub-bios-setup usr/sbin/nginx usr/sbin/php5-fpm +usr/share/bash-completion/bash_completion usr/share/file/magic.mgc +usr/share/locale/locale.alias usr/share/misc/magic.mgc usr/share/zoneinfo usr/share/zoneinfo/Africa