Merge branch 'master' into 13.0

frontend/src/components/dialog/transfer-dialog.js

@@ -32,6 +32,7 @@ class TransferDialog extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
+      options: [],
       selectedOption: null,
       errorMsg: [],
       transferToUser: true,
@@ -39,7 +40,6 @@ class TransferDialog extends React.Component {
       reshare: false,
       activeTab: !this.props.isDepAdminTransfer ? TRANS_USER : TRANS_DEPART
     };
-    this.options = [];
     this.userSelect = React.createRef();
   }
 
@@ -83,7 +83,7 @@ class TransferDialog extends React.Component {
   }
 
   updateOptions = (departmentsRes) => {
-    this.options = departmentsRes.data.map(item => {
+    const options = departmentsRes.data.map(item => {
       let option = {
         value: item.name,
         email: item.email,
@@ -91,6 +91,7 @@ class TransferDialog extends React.Component {
       };
       return option;
     });
+    this.setState({ options });
   };
 
   onClick = () => {
@@ -182,7 +183,7 @@ class TransferDialog extends React.Component {
                   hideSelectedOptions={true}
                   components={makeAnimated()}
                   placeholder={gettext('Select a department')}
-                  options={this.options}
+                  options={this.state.options}
                   onChange={this.handleSelectChange}
                   value={this.state.selectedOption}
                   className="transfer-repo-select-department"

scripts/seaf-fuse.sh

@@ -76,7 +76,7 @@ function validate_seafile_data_dir () {
 }
 
 function validate_already_running () {
-    if pid=$(pgrep -f "seaf-fuse" 2>/dev/null); then
+    if pid=$(pgrep -f "bin/seaf-fuse" 2>/dev/null); then
         echo "seaf-fuse is already running, pid $pid"
         echo
         exit 1;
@@ -111,7 +111,7 @@ function start_seaf_fuse () {
     sleep 2
 
     # check if seaf-fuse started successfully
-    if ! pgrep -f "seaf-fuse" 2>/dev/null 1>&2; then
+    if ! pgrep -f "bin/seaf-fuse" 2>/dev/null 1>&2; then
         echo "Failed to start seaf-fuse"
         exit 1;
     fi
@@ -121,7 +121,7 @@ function start_seaf_fuse () {
 }
 
 function stop_seaf_fuse() {
-    if ! pgrep -f "seaf-fuse" 2>/dev/null 1>&2; then
+    if ! pgrep -f "bin/seaf-fuse" 2>/dev/null 1>&2; then
         echo "seaf-fuse not running yet"
         return 1;
     fi

scripts/seaf-import.sh

@@ -48,7 +48,6 @@ function check_component_running() {
     fi
 }
 
-<<'COMMENT'
 function validate_already_running () {
     if pid=$(pgrep -f "seafile-monitor.sh" 2>/dev/null); then
         echo "seafile server is still running, stop it by \"seafile.sh stop\""
@@ -59,7 +58,6 @@ function validate_already_running () {
     check_component_running "seaf-server" "seaf-server"
     check_component_running "seafdav" "wsgidav.server.server_cli"
 }
-COMMENT
 
 function run_seaf_import () {
     validate_seafile_data_dir;