Browse Source

Remove old directories

Bob Mottram 11 years ago
parent
commit
f6ace15903
1 changed files with 16 additions and 10 deletions
  1. 16
    10
      install-freedombone.sh

+ 16
- 10
install-freedombone.sh View File

@@ -1702,8 +1702,8 @@ function install_owncloud {
1702 1702
   CHECKSUM=$(sha256sum $OWNCLOUD_ARCHIVE | awk -F ' ' '{print $1}')
1703 1703
   if [[ $CHECKSUM != $OWNCLOUD_HASH ]]; then
1704 1704
       echo 'The sha256 hash of the owncloud download is incorrect. Possibly the file may have been tampered with. Check the hash on the Owncloud web site.'
1705
-	  echo $CHECKSUM
1706
-	  echo $OWNCLOUD_HASH
1705
+      echo $CHECKSUM
1706
+      echo $OWNCLOUD_HASH
1707 1707
       exit 19
1708 1708
   fi
1709 1709
   tar -xjf $OWNCLOUD_ARCHIVE
@@ -1901,8 +1901,8 @@ function install_wiki {
1901 1901
   CHECKSUM=$(sha256sum $WIKI_ARCHIVE | awk -F ' ' '{print $1}')
1902 1902
   if [[ $CHECKSUM != $WIKI_HASH ]]; then
1903 1903
       echo 'The sha256 hash of the Dokuwiki download is incorrect. Possibly the file may have been tampered with. Check the hash on the Dokuwiki web site.'
1904
-	  echo $CHECKSUM
1905
-	  echo $WIKI_HASH
1904
+      echo $CHECKSUM
1905
+      echo $WIKI_HASH
1906 1906
       exit 21
1907 1907
   fi
1908 1908
 
@@ -2085,8 +2085,8 @@ function install_blog {
2085 2085
   CHECKSUM=$(sha256sum $WIKI_MNML_BLOG_ADDON_ARCHIVE | awk -F ' ' '{print $1}')
2086 2086
   if [[ $CHECKSUM != $WIKI_MNML_BLOG_ADDON_HASH ]]; then
2087 2087
       echo 'The sha256 hash of the mnml-blog download is incorrect. Possibly the file may have been tampered with. Check the hash on the Dokuwiki mnmlblog web site and alter WIKI_MNML_BLOG_ADDON_HASH if needed.'
2088
-	  echo $CHECKSUM
2089
-	  echo $WIKI_MNML_BLOG_ADDON_HASH
2088
+      echo $CHECKSUM
2089
+      echo $WIKI_MNML_BLOG_ADDON_HASH
2090 2090
       exit 22
2091 2091
   fi
2092 2092
 
@@ -2102,8 +2102,8 @@ function install_blog {
2102 2102
   CHECKSUM=$(sha256sum $WIKI_BLOGTNG_ADDON_ARCHIVE | awk -F ' ' '{print $1}')
2103 2103
   if [[ $CHECKSUM != $WIKI_BLOGTNG_ADDON_HASH ]]; then
2104 2104
       echo 'The sha256 hash of the blogTNG download is incorrect. Possibly the file may have been tampered with. Check the hash on the Dokuwiki blogTNG web site and alter WIKI_BLOGTNG_ADDON_HASH if needed.'
2105
-	  echo $CHECKSUM
2106
-	  echo $WIKI_BLOGTNG_ADDON_HASH
2105
+      echo $CHECKSUM
2106
+      echo $WIKI_BLOGTNG_ADDON_HASH
2107 2107
       exit 24
2108 2108
   fi
2109 2109
 
@@ -2119,18 +2119,24 @@ function install_blog {
2119 2119
   CHECKSUM=$(sha256sum $WIKI_SQLITE_ADDON_ARCHIVE | awk -F ' ' '{print $1}')
2120 2120
   if [[ $CHECKSUM != $WIKI_SQLITE_ADDON_HASH ]]; then
2121 2121
       echo 'The sha256 hash of the Dokuwiki sqlite download is incorrect. Possibly the file may have been tampered with. Check the hash on the Dokuwiki sqlite plugin web site and alter WIKI_SQLITE_ADDON_HASH if needed.'
2122
-	  echo $CHECKSUM
2123
-	  echo $WIKI_SQLITE_ADDON_HASH
2122
+      echo $CHECKSUM
2123
+      echo $WIKI_SQLITE_ADDON_HASH
2124 2124
       exit 26
2125 2125
   fi
2126 2126
 
2127 2127
   # install dokuwiki sqlite plugin
2128 2128
   tar -xzvf $WIKI_SQLITE_ADDON_ARCHIVE
2129
+  if [ -d "$INSTALL_DIR/sqlite" ]; then
2130
+      rm -rf $INSTALL_DIR/sqlite
2131
+  fi
2129 2132
   mv $WIKI_SQLITE_ADDON_NAME sqlite
2130 2133
   cp -r sqlite /var/www/$WIKI_DOMAIN_NAME/htdocs/lib/plugins/
2131 2134
 
2132 2135
   # install blogTNG
2133 2136
   unzip $WIKI_BLOGTNG_ADDON_ARCHIVE
2137
+  if [ -d "$INSTALL_DIR/blogtng" ]; then
2138
+      rm -rf $INSTALL_DIR/blogtng
2139
+  fi
2134 2140
   mv $WIKI_BLOGTNG_ADDON_NAME blogtng
2135 2141
   cp -r blogtng /var/www/$WIKI_DOMAIN_NAME/htdocs/lib/plugins/
2136 2142