소스 검색

Merge pull request #51 from andreapollastri/develop

Urgent fixes
Andrea Pollastri 5 년 전
부모
커밋
a4d73af68d
2개의 변경된 파일10개의 추가작업 그리고 11개의 파일을 삭제
  1. 6 6
      resources/views/applications.blade.php
  2. 4 5
      storage/app/scripts/hostadd.sh

+ 6 - 6
resources/views/applications.blade.php

@@ -91,12 +91,6 @@
                     <button type="submit" class="btn btn-primary" id="app-create">{{ __('Create application') }}</button>
                     <button type="button" class="btn btn-danger" id="app-coming" style="display: none;">{{ __('Your application is coming... Hold On!') }}</button>
                 </div>
-                <script>
-                    $("#form-app-create").submit(function() {
-                        $("#app-create").hide();
-                        $("#app-coming").show();
-                    });
-                </script>
             </form>
         </div>
     </div>
@@ -193,4 +187,10 @@ $('#deleteModal').on('show.bs.modal', function (event) {
     modal.find('#app-code').val(appcode)
 })
 </script>
+<script>
+    $("#form-app-create").submit(function() {
+        $("#app-create").hide();
+        $("#app-coming").show();
+    });
+</script>
 @endsection

+ 4 - 5
storage/app/scripts/hostadd.sh

@@ -306,13 +306,12 @@ echo "###CIPI###Ok"
 
 #LARAVEL
 if [ "$AUTO_INSTALL" = "laravel" ]; then
-    cd /home/$USER_NAME/web/
-    rm -rf $/home/$USER_NAME/web/BASE_PATH
-    composer create-project laravel/laravel /home/$USER_NAME/web/$BASE_PATH
-    cd /home/$USER_NAME/web/$BASE_PATH
+    rm -rf $/home/$USER_NAME/web/laravel
+    composer create-project laravel/laravel /home/$USER_NAME/web/laravel
+    cd /home/$USER_NAME/web/laravel
     find . -type f -exec chmod 644 {} \;
     find . -type d -exec chmod 755 {} \;
-    chmod 777 -R /home/$USER_NAME/web/$BASE_PATH/storage
+    chmod 777 -R /home/$USER_NAME/web/laravel/storage
 fi
 
 #WORDPRESS