Commit Graph

418 Commits

Author SHA1 Message Date
bmaltais
9a4362fdcd Merge branch 'consolidated_install_scripts' of https://github.com/jstayco/kohya_ss into jstayco-consolidated_install_scripts 2023-04-01 13:09:02 -04:00
JSTayco
ab6c7e2082 Fixed git cloning for new directories. 2023-04-01 09:59:35 -07:00
JSTayco
882e4837b3 Check for valid install directory and upgrade pip in venv 2023-04-01 09:15:07 -07:00
JSTayco
aed9f937da Removed -v test as older versions of bash don't support that option
Made script compatible with very old version of bash, added some guards for library linking, and removed redundant library linking.
2023-04-01 08:52:45 -07:00
bmaltais
2eddd64b90 Merge latest sd-script updates 2023-04-01 07:14:25 -04:00
bmaltais
d37aa6efad v21.3.9 2023-04-01 06:59:59 -04:00
bmaltais
1e24e29631
Merge pull request #503 from bmaltais/revert-466-consolidated_install_scripts
Revert "Consolidated Install/Launch Scripts and Improve README"
2023-04-01 06:35:51 -04:00
bmaltais
9069ee26be
Revert "Consolidated Install/Launch Scripts and Improve README" 2023-04-01 06:34:03 -04:00
bmaltais
97b004e756 Revert "Merge pull request #466 from jstayco/consolidated_install_scripts"
This reverts commit b7a719b51a, reversing
changes made to 538752ccab.
2023-04-01 06:29:45 -04:00
bmaltais
b7a719b51a
Merge pull request #466 from jstayco/consolidated_install_scripts
Consolidated Install/Launch Scripts and Improve README
2023-04-01 05:50:16 -04:00
JSTayco
b2e7d5f419 Minor help text formatting. 2023-03-31 21:38:27 -07:00
JSTayco
c92153e546 Hide pip output better with no verbosity 2023-03-31 21:21:50 -07:00
JSTayco
2a24a8b6fc Update setup.sh 2023-03-31 21:11:24 -07:00
JSTayco
a740fdb006 Update setup.sh 2023-03-31 21:09:43 -07:00
JSTayco
fbf6709946 More safeties around git
And more error messages in verbose mode
2023-03-31 21:03:25 -07:00
JSTayco
4559528d33 git is now location indpendent
removed all cd commands in process
2023-03-31 20:54:21 -07:00
JSTayco
035dad220a git is now location independent
Removed the cd commands in the process
2023-03-31 20:51:49 -07:00
jstayco
d8285a7040
Merge branch 'dev' into consolidated_install_scripts 2023-03-31 20:03:32 -07:00
JSTayco
febd553864 Python is now more dynamic
Made python and the requirements.txt location independent.
2023-03-31 20:00:56 -07:00
JSTayco
b02fb86765 Small README update
Updates README to cover new location change and adds one small comment to clarify a variable
2023-03-31 19:30:43 -07:00
bmaltais
538752ccab
Merge pull request #496 from missionfloyd/setup-batch
Add setup/upgrade batch files
2023-03-31 22:24:34 -04:00
JSTayco
1ff4a609a1 Merge branch 'consolidated_install_scripts' of https://github.com/jstayco/kohya_ss into consolidated_install_scripts 2023-03-31 17:24:12 -07:00
JSTayco
bd2e829ae3 More safeties around Python ops
More safeties and more code consolidation. Now we try to exit the python venv after all the python operations. All the python operations were consolidated to facilitate this.
2023-03-31 17:24:09 -07:00
jstayco
fcffc131e1
Typo fix in README 2023-03-31 16:59:04 -07:00
JSTayco
e5b2257d7d Integrated upgrade.sh
Integrated upgrade.sh functionality, consolidated code to install dependencies, added ability to skip git operations, ensured the script can run from anywhere aimed at installation anywhere, ensured all git commnds worked from anywhere aimed at target folder, normalized specified install directory names (always get the absolute path).
2023-03-31 16:39:28 -07:00
missionfloyd
e6da2d135b Add setup/upgrade batch files 2023-03-31 16:45:04 -06:00
JSTayco
85946799f0 Merge branch 'consolidated_install_scripts' of https://github.com/jstayco/kohya_ss into consolidated_install_scripts 2023-03-30 18:20:46 -07:00
JSTayco
6e7e25cba9 Big update: Verbosity, space check skip,
Huge reorg to account for macOS and other non-Linux OSs. Verbosity levels 1-3 added (used by FDs 3-5). Simplified code by creating more shared functions.
2023-03-30 18:20:42 -07:00
jstayco
90e34cc6f7
Small improvement to an stdout line.
Just a typo fix and added a word in an echo statement.
2023-03-30 16:20:13 -07:00
bmaltais
c001c80e02
Merge pull request #484 from bmaltais/dev
Fix issue with LyCORIS version
2023-03-30 07:23:55 -04:00
bmaltais
9f6e0c1c8f Fix issue with LyCORIS version 2023-03-30 07:23:37 -04:00
jstayco
a062dabe86
Merge branch 'dev' into consolidated_install_scripts 2023-03-29 16:48:05 -07:00
bmaltais
f580520556
Merge pull request #480 from bmaltais/dev
v21.3.7
2023-03-29 19:44:09 -04:00
bmaltais
13c4b1f73b v21.3.7 2023-03-29 19:43:23 -04:00
JSTayco
dd204ed7be Merge branch 'consolidated_install_scripts' of https://github.com/jstayco/kohya_ss into consolidated_install_scripts 2023-03-29 16:06:02 -07:00
JSTayco
bff107878b Default install location is now environment-based
Better default install locations and updated the README to reflect.
2023-03-29 16:05:57 -07:00
jstayco
38aab1c30a
Added forgotten getopt letter 2023-03-29 15:30:41 -07:00
JSTayco
dfe96a581d Remove hard-coded config file path 2023-03-29 15:09:42 -07:00
JSTayco
c490764c7e Simplify environment variable check 2023-03-29 15:07:04 -07:00
JSTayco
1f67aaa43b More robust df check 2023-03-29 14:47:10 -07:00
JSTayco
a58b3b616a Add -p switch to expose public URL
This adds the ability for an extra switch to expose a public URL. We default to private.
2023-03-29 14:41:17 -07:00
JSTayco
094528c7cd Inform user of config copy
Better inform the user what is happening. Upon successful configuration file copy operation, we notify the user where that config is located. Also added small sleep step before calling accelerate config to give the user a chance to read the message.
2023-03-29 13:35:10 -07:00
JSTayco
71c9459db2 Non-interactive mode, new warning, new default config for accel
We now warn the user with a nicely formatted message if they have less than 10Gb space free and offer a 10s window to cancel operations. We now try to configure accelerate with no user input by default, but allow an override.
2023-03-29 13:26:16 -07:00
JSTayco
ee1ac64034 Added setup.sh -h to the README
Some environments can't run setup.sh interactively. This will be convenient for those users.
2023-03-29 12:23:43 -07:00
JSTayco
a99ae6cff7 Fixed root detection and made more robust 2023-03-29 12:07:00 -07:00
JSTayco
403c2b051c More output and fixed package detection on Ubuntu
Ubuntu dpkg detection fixed and more output for detected distros.
2023-03-29 11:42:36 -07:00
JSTayco
9a9976bb1c Move env_var_exist first usage after the function is defined 2023-03-29 11:11:10 -07:00
JSTayco
9257f1dd05 Merge branch 'consolidated_install_scripts' of https://github.com/jstayco/kohya_ss into consolidated_install_scripts 2023-03-29 10:53:21 -07:00
JSTayco
20c525bd59 Enable more arbitrary install locations
Default to master branch (user can override with an argument), update the repo if we find a git folder but no venv folder (indicating blank env), rename BASE_DIR to PARENT_DIR to be more obvious, enable PARENT_DIR to account for an arbitrary amount of folders.
2023-03-29 10:53:15 -07:00
jstayco
981f634c31
Removed superfluous comment 2023-03-29 09:55:04 -07:00