Skip to content

Commit

Permalink
clean composer dependencies and specfile (#141)
Browse files Browse the repository at this point in the history
* remove all files in htdocs/vendor/ except i18n in datatables,
  because they'll be managed by composer
* add .gitignore in htdocs/vendor/ to ensure no files would be tracked
  there except for htdocs/vendor/datatables/i18n
* improve composer.json file to clean the downloaded dependencies and
  keep only the required files in htdocs/vendor
* clean specfile: add bundled dependencies, remove custom autoload and
  local config file, manage the config file migration to /etc/service-desk,
  clean hidden files in bundled php libs, fix license filename,
  add missing htdocs/js directory, remove httpd and add php-fpm dependency
  • Loading branch information
David Coutadeur committed Jul 31, 2024
1 parent ad00342 commit 9830794
Show file tree
Hide file tree
Showing 39 changed files with 68 additions and 19,082 deletions.
12 changes: 11 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,30 @@
},
"scripts": {
"post-update-cmd": [

"rm -rf htdocs/vendor/bootstrap",
"cp -R vendor/twbs/bootstrap/dist htdocs/vendor/bootstrap",
"rm -rf htdocs/vendor/bootstrap/site htdocs/vendor/bootstrap/js/bootstrap.esm* htdocs/vendor/bootstrap/js/bootstrap.js* htdocs/vendor/bootstrap/package-lock.json htdocs/vendor/bootstrap/scss",
"rm -rf vendor/twbs/bootstrap",

"rm -f htdocs/vendor/jquery/js/*",
"mkdir -p htdocs/vendor/jquery/js",
"cp vendor/components/jquery/jquery.min.* htdocs/vendor/jquery/js/",
"rm -rf vendor/components/jquery",

"rm -f htdocs/vendor/datatables/*.js htdocs/vendor/datatables/*.css",
"cp vendor/datatables.net/datatables.net/js/dataTables.min.js htdocs/vendor/datatables/",
"cp vendor/datatables.net/datatables.net-bs5/css/dataTables.bootstrap5.min.css htdocs/vendor/datatables/",
"cp vendor/datatables.net/datatables.net-bs5/js/dataTables.bootstrap5.min.js htdocs/vendor/datatables/",
"cp vendor/datatables.net/datatables.net-buttons/js/dataTables.buttons.min.js htdocs/vendor/datatables/",
"cp vendor/datatables.net/datatables.net-buttons-bs5/css/buttons.bootstrap5.min.css htdocs/vendor/datatables/",
"cp vendor/datatables.net/datatables.net-buttons-bs5/js/buttons.bootstrap5.min.js htdocs/vendor/datatables/",
"rm -rf vendor/datatables.net",

"rm -rf htdocs/vendor/font-awesome/*",
"cp -R vendor/fortawesome/font-awesome/css htdocs/vendor/font-awesome",
"cp -R vendor/fortawesome/font-awesome/webfonts htdocs/vendor/font-awesome"
"cp -R vendor/fortawesome/font-awesome/webfonts htdocs/vendor/font-awesome",
"rm -rf vendor/fortawesome/font-awesome"
]
}
}
3 changes: 3 additions & 0 deletions htdocs/vendor/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*
!.gitignore
!datatables/i18n
1 change: 0 additions & 1 deletion htdocs/vendor/datatables/buttons.bootstrap5.min.css

This file was deleted.

4 changes: 0 additions & 4 deletions htdocs/vendor/datatables/buttons.bootstrap5.min.js

This file was deleted.

Loading

0 comments on commit 9830794

Please sign in to comment.