free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lower case

This commit is contained in:
Bob Mottram 2016-10-02 20:40:33 +01:00
parent 9689b739ed
commit 05cf51f3ba
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/freedombone-app-rss
View File

@ -535,7 +535,7 @@ function install_rss_gnusocial {
# update to the next commit
function_check set_repo_commit
set_repo_commit $RSS_READER_GNUSOCIAL_PATH "RSS reader gnusocial commit" "$RSS_READER_GNUSOCIAL_COMMIT" $RSS_READER_GNUSOCIAL_REPO
set_repo_commit $RSS_READER_GNUSOCIAL_PATH "rss reader gnusocial commit" "$RSS_READER_GNUSOCIAL_COMMIT" $RSS_READER_GNUSOCIAL_REPO
chown -R www-data:www-data $RSS_READER_GNUSOCIAL_PATH
if grep -Fxq "install_rss_gnusocial" $COMPLETION_FILE; then
@ -556,8 +556,8 @@ function install_rss_gnusocial {
cp -r $INSTALL_DIR/ttrss-gnusocial $RSS_READER_GNUSOCIAL_PATH
cd $RSS_READER_GNUSOCIAL_PATH
git checkout $RSS_READER_GNUSOCIAL_COMMIT -b $RSS_READER_GNUSOCIAL_COMMIT
if ! grep -q "RSS reader gnusocial commit" $COMPLETION_FILE; then
echo "RSS reader gnusocial commit:$RSS_READER_GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
if ! grep -q "rss reader gnusocial commit" $COMPLETION_FILE; then
echo "rss reader gnusocial commit:$RSS_READER_GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
fi
chown -R www-data:www-data $RSS_READER_GNUSOCIAL_PATH

10
src/freedombone-syncthing
View File

@ -72,8 +72,8 @@ function new_syncthing_id {
}
function create_syncthing_config {
if grep -q "Syncthing ID" $COMPLETION_FILE; then
SYNCTHING_ID=$(cat $COMPLETION_FILE | grep "Syncthing ID" | awk -F ':' '{print $2}')
if grep -q "syncthing ID" $COMPLETION_FILE; then
SYNCTHING_ID=$(cat $COMPLETION_FILE | grep "syncthing ID" | awk -F ':' '{print $2}')
else
if [ -f $SYNCTHING_CONFIG_FILE ]; then
SYNCTHING_ID=$(cat $SYNCTHING_CONFIG_FILE | grep "device id=" | head -n 1 | awk -F '"' '{print $2}')
@ -82,10 +82,10 @@ function create_syncthing_config {
fi
fi
if ! grep -q "Syncthing ID" $COMPLETION_FILE; then
echo "Syncthing ID:$SYNCTHING_ID" >> $COMPLETION_FILE
if ! grep -q "syncthing ID" $COMPLETION_FILE; then
echo "syncthing ID:$SYNCTHING_ID" >> $COMPLETION_FILE
else
sed -i "s|Syncthing ID.*|Syncthing ID:$SYNCTHING_ID|g" $COMPLETION_FILE
sed -i "s|syncthing ID.*|syncthing ID:$SYNCTHING_ID|g" $COMPLETION_FILE
fi
if [ ! -d $SYNCTHING_CONFIG_PATH ]; then