diff --git a/libretroshare/src/FAQ b/libretroshare/src/FAQ deleted file mode 100644 index 629837280..000000000 --- a/libretroshare/src/FAQ +++ /dev/null @@ -1,6 +0,0 @@ - -RetroShare FAQ ---------------- - -Ask a Question. - diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 65feafeab..5b6df469b 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -152,7 +152,7 @@ HEADERS += dbase/cachestrapper.h \ ft/ftchunkmap.h \ ft/ftserver.h \ ft/fttransfermodule.h \ - ft/ftdwlqueue.h \ + ft/ftdwlqueue.h \ pqi/authssl.h \ pqi/authgpg.h \ pqi/cleanupxpgp.h \ @@ -205,7 +205,7 @@ HEADERS += dbase/cachestrapper.h \ rsiface/rsrank.h \ rsiface/rsstatus.h \ rsiface/rstypes.h \ - rsserver/p3Blog.h \ + rsserver/p3blog.h \ rsserver/p3discovery.h \ rsserver/p3face.h \ rsserver/p3msgs.h \ @@ -251,10 +251,10 @@ HEADERS += dbase/cachestrapper.h \ services/p3ranking.h \ services/p3service.h \ services/p3status.h \ - turtle/p3turtle.h \ - turtle/turtletypes.h \ - turtle/rsturtleitem.h \ - tcponudp/extaddrfinder.h \ + turtle/p3turtle.h \ + turtle/turtletypes.h \ + turtle/rsturtleitem.h \ + tcponudp/extaddrfinder.h \ tcponudp/bio_tou.h \ tcponudp/tcppacket.h \ tcponudp/tcpstream.h \ @@ -281,7 +281,7 @@ SOURCES += \ rsserver/rsinit.cc \ rsserver/p3face-config.cc \ rsserver/p3face-server.cc \ - rsserver/p3Blog.cc \ + rsserver/p3blog.cc \ rsserver/p3discovery.cc \ rsserver/p3msgs.cc \ rsserver/p3photo.cc \ diff --git a/libretroshare/src/rsserver/Makefile b/libretroshare/src/rsserver/Makefile index ed20c5e8b..fae412965 100644 --- a/libretroshare/src/rsserver/Makefile +++ b/libretroshare/src/rsserver/Makefile @@ -12,7 +12,7 @@ RSOBJ = rsinit.o \ p3rank.o \ p3photo.o \ p3msgs.o \ - p3Blog.o \ + p3blog.o \ p3discovery.o \ p3face-server.o \ p3face-config.o \ diff --git a/libretroshare/src/rsserver/p3Blog.cc b/libretroshare/src/rsserver/p3blog.cc similarity index 99% rename from libretroshare/src/rsserver/p3Blog.cc rename to libretroshare/src/rsserver/p3blog.cc index 8cdf5c1d5..005ec7765 100644 --- a/libretroshare/src/rsserver/p3Blog.cc +++ b/libretroshare/src/rsserver/p3blog.cc @@ -43,8 +43,6 @@ bool p3Blog::getBlogs(std::map< std::string, std::multimapgetBlogs(blogs); } - - bool p3Blog::sendBlog(const std::wstring &msg) { return mQblog->sendBlog(msg); @@ -57,6 +55,5 @@ bool p3Blog::getPeerLatestBlog(std::string id, uint32_t &ts, std::wstring &post) post = L"Hmmm, not much, just eating prawn crackers at the moment... but I'll post this every second if you want ;)"; return true; - } diff --git a/libretroshare/src/rsserver/p3Blog.h b/libretroshare/src/rsserver/p3blog.h similarity index 100% rename from libretroshare/src/rsserver/p3Blog.h rename to libretroshare/src/rsserver/p3blog.h diff --git a/libretroshare/src/version_detail.sh b/libretroshare/src/version_detail.sh index 03da58d67..61b5eaebb 100755 --- a/libretroshare/src/version_detail.sh +++ b/libretroshare/src/version_detail.sh @@ -3,20 +3,6 @@ #don't exit even if a command fails set +e - -if ( git log -n 1 &> /dev/null); then - #retrieve git information - version="git : $(git status | grep branch | cut -c 13-) $(git log -n 1 | grep commit | cut -c 8-)" -fi - -if ( git log -n 1 | grep svn &> /dev/null); then - #retrieve git svn information - version="$version svn : $(git log -n 1 | grep svn | awk '{print $2}' | head -1 | sed 's/.*@//')" -elif ( git log -n 10 | grep svn &> /dev/null); then - #retrieve git svn information - version="$version svn closest version : $(git log -n 10 | grep svn | awk '{print $2}' | head -1 | sed 's/.*@//')" -fi - if ( svn info &> /dev/null); then version=$(svn info | head -n 5 | tail -1) fi