From f863c245d097ddcc6d8e02f88eda95f643426acd Mon Sep 17 00:00:00 2001
From: zhoupc <zhoupc1988@cmu.edu>
Date: Tue, 9 Oct 2018 23:50:49 -0400
Subject: [PATCH] fix the issue of not including submodules when releasing a
 package on github

---
 cnmfe_setup.m | 18 +++++++++++++++---
 versions.log  |  4 ++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/cnmfe_setup.m b/cnmfe_setup.m
index 4618b41..e6961db 100644
--- a/cnmfe_setup.m
+++ b/cnmfe_setup.m
@@ -11,9 +11,21 @@
     cnmfe_loaded = true;
 end
 
-%% install deconvolution package 
-run(fullfile(cnmfe_folder, 'OASIS_matlab', 'oasis_setup.m'));
-
+%% install deconvolution package
+oasis_folder = fullfile(cnmfe_folder, 'OASIS_matlab'); 
+if exist(fullfile(oasis_folder, 'oasis_setup.m'), 'file')
+    run(fullfile(cnmfe_folder, 'OASIS_matlab', 'oasis_setup.m'));
+else
+    oasis_url = 'https://github.com/zhoupc/OASIS_matlab/archive/master.zip'; 
+    fprintf('downloading OASIS_matlab....\n'); 
+    unzip(oasis_url, cnmfe_folder); 
+    if exist(oasis_folder, 'dir')
+        rmdir(oasis_folder, 's');
+    end
+    movefile(fullfile(cnmfe_folder, 'OASIS_matlab-master'), ...
+        oasis_folder);
+    fprintf('done!\n'); 
+end
 %% install convex optimization solvers
 % by default, we don't install cvx any more. if you want to install cvx,
 % then set install_cvx = true and then run oasis-setup.m 
diff --git a/versions.log b/versions.log
index fa7653f..cb22490 100644
--- a/versions.log
+++ b/versions.log
@@ -1,9 +1,9 @@
 version: 1.1.0
-git commit: acdd20b5cecbc8be85f7684aa8e11176d10a3aa2
+git commit: cc70883814b1dd428ba51b547a8eb2834a01e222
 
 10/09/2018
 Version 1.1.0 
-git commit: acdd20b5cecbc8be85f7684aa8e11176d10a3aa2
+git commit: cc70883814b1dd428ba51b547a8eb2834a01e222
 Note: all updates since the first releast. 
 
 01/15/2018