this commit marks the release point of version 1.3.0

mhogomchungu · Aug 17, 2017 · f7cc333 · f7cc333
1 parent 77abee4
commit f7cc333
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ set_property( GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS ON )
 
 project( sirikali )
 
-set( PGR_VERSION "1.2.9" )
+set( PGR_VERSION "1.3.0" )
 
 add_definitions( -Wextra -Wall -pedantic )
 

diff --git a/changelog b/changelog
@@ -99,5 +99,6 @@ version 1.2.9
 -- Fix a crash on exit in OSX.
 -- Show all crypto options when creating Cryfs volume.
 
-version 1.3.0(unreleased)
+version 1.3.0
 -- Add "~/bin" and "~/.bin" paths to list of folders to search for executables.
+-- Fix random crashes on OSX.
diff --git a/debian.upstream/changelog b/debian.upstream/changelog
@@ -1,3 +1,11 @@
+sirikali (1.3.0-1) UNRELEASED; urgency=low
+  [Mhogo Mchungu]
+  * New Features
+     -- Add "~/bin" and "~/.bin" paths to list of folders to search for executables.
+     -- Fix random crashes on OSX.
+
+ -- Mhogo Mchungu <[email protected]>  Thu, 17 Aug 2017 16:38:48 +0000
+
 sirikali (1.2.9-1) UNRELEASED; urgency=low
   [Mhogo Mchungu]
   * New Features

diff --git a/rpm/BUILD_INSTRUCTIONS b/rpm/BUILD_INSTRUCTIONS
@@ -1,6 +1,6 @@
 
 ps: copy and paste all given commands to make sure you dont mistype them.
-ps: at step 5,replace "1.2.9" to SiriKali version you are building.
+ps: at step 5,replace "1.3.0" to SiriKali version you are building.
 ps: these instructions assumes rpm build directory is at "~/rpmbuild".
     Modify the paths in step 5 if they are different in your distribution.
 
@@ -32,8 +32,8 @@ ps: these instructions assumes rpm build directory is at "~/rpmbuild".
    ****************************************************************************************************************
 
    rpmdev-setuptree
-   tar   -cf  ~/rpmbuild/SOURCES/SiriKali-1.2.9.tar ../SiriKali-1.2.9
-   xz    -z  ~/rpmbuild/SOURCES/SiriKali-1.2.9.tar
+   tar   -cf  ~/rpmbuild/SOURCES/SiriKali-1.3.0.tar ../SiriKali-1.3.0
+   xz    -z  ~/rpmbuild/SOURCES/SiriKali-1.3.0.tar
 
    ****************************************************************************************************************
 

diff --git a/rpm/sirikali.spec b/rpm/sirikali.spec
@@ -17,7 +17,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 Name:           SiriKali
-Version:        1.2.9
+Version:        1.3.0
 Release:        0
 Summary:        SiriKali is a Qt/C++ GUI front end to encfs,cryfs,gocryptfs,ecryptfs and securefs.
 License:        GPL-2.0+
@@ -77,8 +77,8 @@ rm -rf $RPM_BUILD_DIR/sirikali
 %{_datadir}/sirikali/translations/fr_FR.qm
 %{_datadir}/sirikali/translations/es_MX.qm
 %{_datadir}/polkit-1/actions/org.sirikali.pkexec.policy
-%{_datadir}/man/man1/sirikali.1.gz
-%{_datadir}/man/man1/sirikali.pkexec.1.gz
+%{_datadir}/man/man1/sirikali.1.bz2
+%{_datadir}/man/man1/sirikali.pkexec.1.bz2
 %defattr(0644,root,root)
 
 %changelog
diff --git a/src/mountinfo.cpp b/src/mountinfo.cpp
@@ -25,7 +25,7 @@
 #include <QMetaObject>
 
 enum class background_thread{ True,False } ;
-static QStringList _mounted_volumes( background_thread thread )
+static QStringList _unlocked_volumes( background_thread thread )
 {
 	if( utility::platformIsLinux() ){
 
@@ -43,7 +43,7 @@ static QStringList _mounted_volumes( background_thread thread )
 		QString fs ;
 		const QString w = "x x x:x x %1 %2,x - %3 %4 x" ;
 
-		auto list = [ & ](){
+		auto e = [ & ](){
 
 			if( thread == background_thread::True ){
 
@@ -53,7 +53,7 @@ static QStringList _mounted_volumes( background_thread thread )
 			}
 		}() ;
 
-		for( const auto& it : list ){
+		for( const auto& it : e ){
 
 			auto e = utility::split( it,' ' ) ;
 
@@ -77,10 +77,9 @@ mountinfo::mountinfo( QObject * parent,bool e,std::function< void() >&& quit ) :
 	m_parent( parent ),
 	m_quit( std::move( quit ) ),
 	m_announceEvents( e ),
-	m_linux( utility::platformIsLinux() ),
-	m_oldMountList( _mounted_volumes( background_thread::False ) )
+	m_oldMountList( _unlocked_volumes( background_thread::False ) )
 {
-	if( m_linux ){
+	if( utility::platformIsLinux() ){
 
 		this->linuxMonitor() ;
 	}else{
@@ -161,7 +160,7 @@ Task::future< QVector< volumeInfo > >& mountinfo::unlockedVolumes()
 
 		volumeInfo::mountinfo info ;
 
-		for( const auto& it : _mounted_volumes( background_thread::True ) ){
+		for( const auto& it : _unlocked_volumes( background_thread::True ) ){
 
 			if( volumeInfo::supported( it ) ){
 
@@ -220,7 +219,7 @@ void mountinfo::stop()
 
 void mountinfo::volumeUpdate()
 {
-	m_newMountList = _mounted_volumes( background_thread::False ) ;
+	m_newMountList = _unlocked_volumes( background_thread::False ) ;
 
 	auto _volumeWasMounted = [ & ](){
 

diff --git a/src/mountinfo.h b/src/mountinfo.h
@@ -61,7 +61,6 @@ private slots:
 	std::function< void() > m_quit ;
 
 	bool m_announceEvents ;
-	bool m_linux ;
 
 	QStringList m_oldMountList ;
 	QStringList m_newMountList ;