From 55626cf414f947be0ce5c8300f97f99421c2e222 Mon Sep 17 00:00:00 2001 From: kaotisk Date: Mon, 24 Jun 2024 05:41:52 +0300 Subject: Reworked tempassin to lib/_ak_script --- modules/articles/main.sh | 4 ++-- modules/categories/main.sh | 4 ++-- modules/comments/main.sh | 4 ++-- modules/files/main.sh | 2 +- modules/folders/main.sh | 2 +- modules/news/main.sh | 6 +++--- modules/reference/main.sh | 4 ++-- modules/todos/main.sh | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) (limited to 'modules') diff --git a/modules/articles/main.sh b/modules/articles/main.sh index 29c1c34..ebc9dd8 100755 --- a/modules/articles/main.sh +++ b/modules/articles/main.sh @@ -28,7 +28,7 @@ else fi _ak_modules_articles_create(){ - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" cd $TEMP export ARTICLES_FILE="$(date +%Y%m%d_%H%M%S)" if [ -z $EDITOR ] @@ -85,7 +85,7 @@ _ak_modules_articles_import(){ } _ak_modules_articles_add(){ - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" cd $TEMP if [ -f $1 ]; then FILE="$1" diff --git a/modules/categories/main.sh b/modules/categories/main.sh index 82fc669..089b6d7 100755 --- a/modules/categories/main.sh +++ b/modules/categories/main.sh @@ -30,7 +30,7 @@ else fi _ak_modules_categories_create(){ - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" cd $TEMP export NEWS_FILE="$(date +%Y%m%d_%H%M%S)" vi $NEWS_FILE @@ -78,7 +78,7 @@ _ak_modules_categories_import(){ exit 224 } _ak_modules_categories_add(){ - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" cd $TEMP if [ -f $1 ]; then FILE="$1" diff --git a/modules/comments/main.sh b/modules/comments/main.sh index f5ebabc..925bf90 100755 --- a/modules/comments/main.sh +++ b/modules/comments/main.sh @@ -38,7 +38,7 @@ _ak_modules_comments_create(){ echo "ERROR" "No reference given" exit 1 fi - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" cd $TEMP export COMMENTS_FILE="$(date -u +%s)" vi $COMMENTS_FILE @@ -68,7 +68,7 @@ _ak_modules_comments_index(){ } _ak_modules_comments_add(){ - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" cd $TEMP if [ -f "$ZCOMMENTSDIR/$1" ]; then FILE=$ZCOMMENTSDIR/$1 diff --git a/modules/files/main.sh b/modules/files/main.sh index a3202fe..809d76d 100755 --- a/modules/files/main.sh +++ b/modules/files/main.sh @@ -41,7 +41,7 @@ main(){ CRP="$2" echo "Adding $FILENAME" _ak_log_info "Switching to tmp folder..." - TEMPASSIN="$(ak-tempassin)" + TEMPASSIN="$(_ak_make_temp_directory)" cd $TEMPASSIN if [ $? == 0 ]; then _ak_log_info "Success" diff --git a/modules/folders/main.sh b/modules/folders/main.sh index f155548..a87881d 100755 --- a/modules/folders/main.sh +++ b/modules/folders/main.sh @@ -25,7 +25,7 @@ else _ak_log_info "Found $ZFOLDERSDIR" exit 1 fi -TEMPASSIN="$(ak-tempassin)" +TEMPASSIN="$(_ak_make_temp_directory)" cd $TEMPASSIN diff --git a/modules/news/main.sh b/modules/news/main.sh index 1a0b5e0..8770eea 100755 --- a/modules/news/main.sh +++ b/modules/news/main.sh @@ -48,7 +48,7 @@ fi cd $ZNEWSDIR _ak_modules_news_create(){ - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" cd $TEMP cd curpath="$(pwd)" @@ -113,7 +113,7 @@ _ak_modules_news_import(){ } _ak_modules_news_add_from_file(){ - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" if [ -f "$1" ]; then FILE="$(realpath $1)" cp $FILE $ZNEWSDIR @@ -152,7 +152,7 @@ EOF } _ak_modules_news_add(){ - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" cd $TEMP if [ -f $ZNEWSDIR/$1 ]; then FILE="$1" diff --git a/modules/reference/main.sh b/modules/reference/main.sh index e6c06d3..b17b7ce 100755 --- a/modules/reference/main.sh +++ b/modules/reference/main.sh @@ -30,7 +30,7 @@ else fi _ak_modules_reference_create(){ - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" cd $TEMP export REFERENCEFILE="$(date -u +%s)" if [ ! -z $1 ] && [ ! -z $2 ] @@ -92,7 +92,7 @@ _ak_modules_reference_import(){ } _ak_modules_reference_add(){ - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" cd $TEMP if [ ! -f $1 ]; then echo "File $FILE doesn't exist"; diff --git a/modules/todos/main.sh b/modules/todos/main.sh index 299bcb0..a9786a1 100755 --- a/modules/todos/main.sh +++ b/modules/todos/main.sh @@ -36,7 +36,7 @@ else fi _ak_modules_todos_create(){ - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" cd $TEMP export TODOS_FILE="$(date -u +%s)" vi $TODOS_FILE @@ -87,7 +87,7 @@ _ak_modules_todos_import(){ } _ak_modules_todos_add(){ - TEMP="$(ak-tempassin)" + TEMP="$(_ak_make_temp_directory)" cd $TEMP if [ -f $1 ]; then FILE="$1" -- cgit v1.2.3