Bob Mottram пре 7 година
родитељ
комит
ed9fb5bc4a
2 измењених фајлова са 6 додато и 9 уклоњено
  1. 4
    1
      src/freedombone-app-pelican
  2. 2
    8
      src/freedombone-mesh-blog

+ 4
- 1
src/freedombone-app-pelican Прегледај датотеку

332
     CHOSEN_THEME_INDEX=$((CHOSEN_THEME_INDEX - 1))
332
     CHOSEN_THEME_INDEX=$((CHOSEN_THEME_INDEX - 1))
333
 
333
 
334
     CHOSEN_THEME=${THEMES[$CHOSEN_THEME_INDEX]}
334
     CHOSEN_THEME=${THEMES[$CHOSEN_THEME_INDEX]}
335
-    pelican_remove_bad_blog_links $CHOSEN_THEME
335
+
336
+    cd $PELICAN_BLOG_INSTALL_DIR/themes/$CHOSEN_THEME
337
+    pelican_remove_bad_blog_links
338
+
336
     if grep -q "THEME=" $PELICAN_BLOG_INSTALL_DIR/pelicanconf.py; then
339
     if grep -q "THEME=" $PELICAN_BLOG_INSTALL_DIR/pelicanconf.py; then
337
         sed -i "s|THEME=.*|THEME='themes/${CHOSEN_THEME}'|g" $PELICAN_BLOG_INSTALL_DIR/pelicanconf.py
340
         sed -i "s|THEME=.*|THEME='themes/${CHOSEN_THEME}'|g" $PELICAN_BLOG_INSTALL_DIR/pelicanconf.py
338
     else
341
     else

+ 2
- 8
src/freedombone-mesh-blog Прегледај датотеку

50
     find ./ -type f -name *.html -exec sed -i -e '/bootstrapcdn/d' {} \;
50
     find ./ -type f -name *.html -exec sed -i -e '/bootstrapcdn/d' {} \;
51
 }
51
 }
52
 
52
 
53
-function remove_bad_blog_links_from_theme {
54
-    current_theme=$1
55
-
56
-    cd $BLOG_PATH/themes/$current_theme
57
-    remove_bad_blog_links
58
-}
59
-
60
 function ipfs_publish {
53
 function ipfs_publish {
61
     DIR_TO_CHECK=/home/$USER/Public
54
     DIR_TO_CHECK=/home/$USER/Public
62
     if [ ! -d $DIR_TO_CHECK ]; then
55
     if [ ! -d $DIR_TO_CHECK ]; then
219
     CHOSEN_THEME_INDEX=$((CHOSEN_THEME_INDEX - 1))
212
     CHOSEN_THEME_INDEX=$((CHOSEN_THEME_INDEX - 1))
220
 
213
 
221
     CHOSEN_THEME=${THEMES[$CHOSEN_THEME_INDEX]}
214
     CHOSEN_THEME=${THEMES[$CHOSEN_THEME_INDEX]}
222
-    remove_bad_blog_links_from_theme $CHOSEN_THEME
215
+    cd cd $BLOG_PATH/themes/$CHOSEN_THEME
216
+    remove_bad_blog_links
223
     if grep -q "THEME=" $BLOG_PATH/pelicanconf.py; then
217
     if grep -q "THEME=" $BLOG_PATH/pelicanconf.py; then
224
         sed -i "s|THEME=.*|THEME='themes/${CHOSEN_THEME}'|g" $BLOG_PATH/pelicanconf.py
218
         sed -i "s|THEME=.*|THEME='themes/${CHOSEN_THEME}'|g" $BLOG_PATH/pelicanconf.py
225
     else
219
     else