update

Author: bobimicroweber

web/app/Models/GitRepository.php

@@ -86,8 +86,8 @@ private function _getSSHKey($gitSshKeyId, $findHostingSubscription)
                 shell_exec('mkdir -p ' . $sshPath);
             }
 
-            shell_exec('chown '.$findHostingSubscription->system_username.':'.$findHostingSubscription->system_username.' -R ' . dirname($sshPath));
-            shell_exec('chmod 0700 ' . dirname($sshPath));
+            shell_exec('chown '.$findHostingSubscription->system_username.':'.$findHostingSubscription->system_username.' -R ' . $sshPath);
+            shell_exec('chmod 0700 ' . $sshPath);
 
             if (!file_exists($privateKeyFile)) {
                 file_put_contents($privateKeyFile, $gitSSHKey->private_key);
@@ -156,7 +156,7 @@ public function pull()
         shell_exec('mkdir -p ' . dirname($shellFile));
         shell_exec('chown '.$findHostingSubscription->system_username.':'.$findHostingSubscription->system_username.' -R ' . dirname(dirname($shellFile)));
 
-        $shellContent = view('actions.git.pull-repo', [
+        $shellContent = view('actions.git.pull-repo-user', [
             'gitProvider' => $gitSSHUrl['provider'],
             'systemUsername' => $findHostingSubscription->system_username,
             'gitRepositoryId' => $this->id,

web/resources/views/actions/git/pull-repo-user.blade.php

@@ -2,6 +2,8 @@
 
 cd {{$projectDir}}
 
+git reset --hard
+
 @if($privateKeyFile)
 
 ssh-keyscan {{$gitProvider}} >> /home/{{$systemUsername}}/.ssh/known_hosts
@@ -17,5 +19,3 @@
 @endif
 
 rm -rf {{$selfFile}}
-
-curl